diff --git a/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java b/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java
index 302a9b0..77a7d0d 100644
--- a/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java
+++ b/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java
@@ -4,6 +4,9 @@ import com.vaadin.flow.component.applayout.AppLayout;
 import com.vaadin.flow.component.applayout.DrawerToggle;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.html.H1;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.sidenav.SideNav;
+import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.component.tabs.Tab;
 import com.vaadin.flow.component.tabs.Tabs;
 import com.vaadin.flow.router.Layout;
@@ -22,8 +25,8 @@ public class KickerAppLayout extends AppLayout {
 
         addToNavbar(drawerToggle, title);
 
-        RouterLink enter1vs1 = new RouterLink("1 vs 1", Enter1vs1View.class);
-        RouterLink enter2vs2 = new RouterLink("2 vs 2", Enter2vs2View.class);
+        RouterLink enter1vs1 = new RouterLink("1 vs 1 Ergebnis", Enter1vs1View.class);
+        RouterLink enter2vs2 = new RouterLink("2 vs 2 Ergebnis", Enter2vs2View.class);
         RouterLink playerList = new RouterLink("Spielerliste", PlayerListView.class);
         RouterLink graph1vs1 = new RouterLink("Graph 1 vs 1", Graph1vs1View.class);
         RouterLink graph2vs2 = new RouterLink("Graph 2 vs 2", Graph2vs2View.class);
@@ -31,9 +34,26 @@ public class KickerAppLayout extends AppLayout {
         RouterLink history2vs2 = new RouterLink("Resultate 2 vs 2", History2vs2View.class);
         RouterLink admin = new RouterLink("Verwaltung", AdminView.class);
 
-        Tabs tabs = new Tabs(new Tab(playerList), new Tab(enter1vs1), new Tab(enter2vs2), new Tab(graph1vs1),
-                new Tab(graph2vs2), new Tab(history1vs1), new Tab(history2vs2), new Tab(admin));
+        Tabs tabs = new Tabs(new Tab(VaadinIcon.GROUP.create(), playerList), new Tab(VaadinIcon.COG.create(), admin),
+                new Tab(VaadinIcon.EDIT.create(), enter1vs1), new Tab(VaadinIcon.BAR_CHART.create(), graph1vs1), new Tab(VaadinIcon.RECORDS.create(), history1vs1),
+                new Tab(VaadinIcon.EDIT.create(), enter2vs2), new Tab(VaadinIcon.BAR_CHART.create(), graph2vs2), new Tab(VaadinIcon.RECORDS.create(), history2vs2));
         tabs.setOrientation(Tabs.Orientation.VERTICAL);
-        addToDrawer(tabs);
+
+        SideNav general = new SideNav("Allgemein");
+        general.setCollapsible(true);
+        general.addItem(new SideNavItem("Spielerliste", PlayerListView.class, VaadinIcon.GROUP.create()),
+                new SideNavItem("Verwaltung", AdminView.class, VaadinIcon.COG.create()));
+        SideNav nav1 = new SideNav("1 vs 1");
+        nav1.setCollapsible(true);
+        nav1.addItem(new SideNavItem("Ergebnis eintragen",  Enter1vs1View.class, VaadinIcon.EDIT.create()),
+                new SideNavItem("ELO-Graph",  Graph1vs1View.class, VaadinIcon.BAR_CHART.create()),
+                new SideNavItem("Historie", History1vs1View.class, VaadinIcon.RECORDS.create()));
+        SideNav nav2 = new SideNav("2 vs 2");
+        nav2.setCollapsible(true);
+        nav2.addItem(new SideNavItem("Ergebnis eintragen", Enter2vs2View.class, VaadinIcon.EDIT.create()),
+                new SideNavItem("ELO-Graph", Graph2vs2View.class, VaadinIcon.BAR_CHART.create()),
+                new SideNavItem("Historie", History2vs2View.class, VaadinIcon.RECORDS.create()));
+
+        addToDrawer(general, nav1, nav2);
     }
 }
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index 35ac1b0..9306521 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -2,7 +2,9 @@ server.port=${PORT:8080}
 logging.level.org.atmosphere = warn
 spring.mustache.check-template-location = false
 
-spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.url=jdbc:h2:file:./data
+spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
-spring.jpa.hibernate.ddl-auto=create
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
\ No newline at end of file