diff --git a/slt/css/components/_current-page-manu.scss b/slt/css/components/_current-page-manu.scss
index 2407948..517c9f8 100644
--- a/slt/css/components/_current-page-manu.scss
+++ b/slt/css/components/_current-page-manu.scss
@@ -1,4 +1,4 @@
-#left-menu .current-page-menu ul.menu {
+#left-menu .current-page-menu ul.mod-menu {
     background-color: transparent;
     padding-top: 0;
     padding-bottom: 0;
diff --git a/slt/css/layout/_leftmenu.scss b/slt/css/layout/_leftmenu.scss
index 1d8c87a..8897846 100644
--- a/slt/css/layout/_leftmenu.scss
+++ b/slt/css/layout/_leftmenu.scss
@@ -8,7 +8,7 @@
         display: block;
         margin: 15px 0 15px 5px;
 
-        > ul.menu {
+        > ul.mod-menu {
             padding: 10px;
 
             li > a {
@@ -17,15 +17,27 @@
         }
     }
 
+    .nav {
+        display: block;
+
+        li > a {
+            display: block;
+        }
+    }
+
     .nav > li,
-    .nav-child > li {
+    .mod-menu__sub > li {
         padding: 5px 0;
         border-top-style: solid;
         border-width: 1px;
+
+        &:first-child {
+            border-top-style: none;
+        }
     }
 
-    .nav > li:first-child,
-    .nav-child > li:first-child {
-        border-top-style: none;
-    }
+    // .nav > li:first-child,
+    // .mod-menu__sub > li:first-child {
+        // border-top-style: none;
+    // }
 }
diff --git a/slt/css/layout/_menu.scss b/slt/css/layout/_menu.scss
index 72eb955..e1cc272 100644
--- a/slt/css/layout/_menu.scss
+++ b/slt/css/layout/_menu.scss
@@ -8,7 +8,7 @@
     }
 }
 
-.nav-child {
+.mod-menu__sub {
     font-size: small;
 
     > li > a {
@@ -19,13 +19,13 @@
 }
 
 .nav,
-.nav-child {
+.mod-menu__sub {
     padding: 0;
 
     > li {
         display: block;
 
-        > .nav-child {
+        > .mod-menu__sub {
             padding-left: 10px;
             margin-left: 10px;
 
@@ -37,7 +37,7 @@
 }
 
 ul.nav > li > a:hover,
-ul.nav-child > li > a:hover {
+ul.mod-menu__sub > li > a:hover {
     /* background-color: inherit; */
 
     /* FIXME */
diff --git a/slt/css/layout/_mobile-menu.scss b/slt/css/layout/_mobile-menu.scss
index c84bc03..28208d0 100644
--- a/slt/css/layout/_mobile-menu.scss
+++ b/slt/css/layout/_mobile-menu.scss
@@ -41,7 +41,7 @@
         margin-right: 5px;
     }
 
-    .nav-child > li {
+    .mod-menu__sub > li {
         margin: 0;
     }
 
@@ -54,7 +54,7 @@
         border: none;
     }
 
-    > ul.menu {
+    > ul.mod-menu {
         background-color: initial;
         color: initial;
         margin-bottom: initial;
diff --git a/slt/css/layout/_topmenu.scss b/slt/css/layout/_topmenu.scss
index 6589949..26d34a4 100644
--- a/slt/css/layout/_topmenu.scss
+++ b/slt/css/layout/_topmenu.scss
@@ -28,7 +28,7 @@
     }
 
     .nav > li,
-    .nav-child > li {
+    .mod-menu__sub > li {
         padding: 0;
         border-style: none;
     }
@@ -51,6 +51,7 @@
         > li {
             display: inline-block;
             text-align: left;
+            // height: 100%;
 
             @include abstract.for-desktop {
                 text-align: left;
@@ -59,6 +60,8 @@
             > a {
                 position: relative;
                 font-size: large;
+                display: block;
+                height: 100%;
 
                 @include abstract.for-desktop {
                     font-size: large;
@@ -72,7 +75,7 @@
                 background-color: inherit;
             }
 
-            > .nav-child {
+            > .mod-menu__sub {
                 position: absolute;
                 display: none;
 
@@ -107,7 +110,7 @@
                 }
             }
 
-            &:hover > .nav-child {
+            &:hover > .mod-menu__sub {
                 display: block;
 
                 @include abstract.for-desktop {
@@ -126,35 +129,35 @@
             color: inherit;
         }
 
-        .nav-child > li:hover > a:hover,
-        .nav-child > li:focus > a:hover,
-        .nav-child > li:hover > a:focus {
+        .mod-menu__sub > li:hover > a:hover,
+        .mod-menu__sub > li:focus > a:hover,
+        .mod-menu__sub > li:hover > a:focus {
             text-decoration: none;
         }
     }
 
     // Special colors for topics
-    > ul.nav .nav-child a.lehre {
+    > ul.nav .mod-menu__sub a.lehre {
         border-left-color: abstract.$color-lehre;
     }
 
-    > ul.nav .nav-child a.breitensport {
+    > ul.nav .mod-menu__sub a.breitensport {
         border-left-color: abstract.$color-breitensport;
     }
 
-    > ul.nav .nav-child a.jugend {
+    > ul.nav .mod-menu__sub a.jugend {
         border-left-color: abstract.$color-jugend;
     }
 
-    > ul.nav .nav-child a.jmd {
+    > ul.nav .mod-menu__sub a.jmd {
         border-left-color: abstract.$color-jmd;
     }
 
-    > ul.nav .nav-child a.fachverbaende {
+    > ul.nav .mod-menu__sub a.fachverbaende {
         border-left-color: abstract.$color-fachverbaende;
     }
 
-    > ul.nav .nav-child a.sport {
+    > ul.nav .mod-menu__sub a.sport {
         border-left-color: abstract.$color-sport;
     }
 }