diff --git a/themes/neff/assets/scss/_content.scss b/themes/neff/assets/scss/_content.scss
index 43af634..2c89b8b 100644
--- a/themes/neff/assets/scss/_content.scss
+++ b/themes/neff/assets/scss/_content.scss
@@ -1,39 +1,3 @@
 #content {
     flex: 1 1 0;
-
-    .container {
-        margin-bottom: $gutter-width;
-        border-radius: $border-radius;
-    }
-
-    .flex {
-        justify-content: start;
-
-        & > * {
-            flex: 1 1 0;
-            min-width: $min-column-width;
-        }
-
-        h1, h2, h3, h4, h5, h6 {
-            min-width: 100%;
-        }
-    }
-
-    @media only screen and (min-width: $media-query) {
-        .flex {
-            & > * {
-                min-width: $min-column-width-desktop;
-            }
-
-            p {
-                max-width: 90%;
-            }
-
-            &.gallery {
-                li {
-                    max-width: calc(#{$min-column-width-desktop} + calc(2 * #{$gutter-width}));
-                }
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/themes/neff/assets/scss/_footer.scss b/themes/neff/assets/scss/_footer.scss
index 7b76d15..f955b4a 100644
--- a/themes/neff/assets/scss/_footer.scss
+++ b/themes/neff/assets/scss/_footer.scss
@@ -1,40 +1,35 @@
 #footer {
-    .container.bottom {
-        border-radius: $border-radius $border-radius 0 0;
-        margin-bottom: 0;
-    }
-
-    .container {
-        margin-bottom: $gutter-width;
-        border-radius: $border-radius;
-    }
-    #footer-menu {
-        @include menu-list(row);
+    nav {
+        display: flex;
+        flex-direction: row;
         align-items: flex-end;
-        margin: 0;
-        padding: 0;
         flex-wrap: wrap;
 
-        li {
-            flex: 1 0 0;
-            width: 100%;
-            padding: $gutter-width 0 0 0;
-            margin: 0;
-            min-width: $min-column-width;
+        ul {
+            @include menu-list(row);
+            flex: 1 1 0;
+            height: 100%;
 
-            .sub-menu {
-                @include menu-list(column);
-                margin: 0;
+            li {
+                flex: 1 0 0;
+                width: 100%;
                 padding: 0;
+                margin: 0;
+                min-width: $min-column-width;
 
-                li {
-                    min-width: $min-column-width;
+                .sub-menu {
+                    @include menu-list(column);
+                    margin: 0;
                     padding: 0;
+
+                    li {
+                        min-width: $min-column-width;
+                        padding: 0;
+                    }
                 }
             }
         }
     }
-
     #footer-social {
         ul {
             @include menu-list(row);
diff --git a/themes/neff/assets/scss/_grid.scss b/themes/neff/assets/scss/_grid.scss
index ec2d25a..a84ce11 100644
--- a/themes/neff/assets/scss/_grid.scss
+++ b/themes/neff/assets/scss/_grid.scss
@@ -260,6 +260,20 @@ figure.small {
     }
 }
 
+figure.left {
+    float: left;
+    margin-right: $gutter-width;
+    max-width: $min-column-width;
+    padding: 0.5rem 0;
+}
+
+figure.right {
+    float: right;
+    margin-left: $gutter-width;
+    max-width: $min-column-width;
+    padding: 0.5rem 0;
+}
+
 img.original {
     width: auto !important;
     max-width: 100%
@@ -326,4 +340,40 @@ a.btn-primary {
         height: 100%; 
         border:0;
     }
+}
+
+.container {
+    margin-bottom: $gutter-width;
+    border-radius: $border-radius;
+}
+
+.flex {
+    justify-content: start;
+
+    & > * {
+        flex: 1 1 0;
+        min-width: $min-column-width;
+    }
+
+    h1, h2, h3, h4, h5, h6 {
+        min-width: 100%;
+    }
+}
+
+@media only screen and (min-width: $media-query) {
+    .flex {
+        & > * {
+            min-width: $min-column-width-desktop;
+        }
+
+        p {
+            max-width: 90%;
+        }
+
+        &.gallery {
+            li {
+                max-width: calc(#{$min-column-width-desktop} + calc(2 * #{$gutter-width}));
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/themes/neff/assets/scss/_header.scss b/themes/neff/assets/scss/_header.scss
index de27b79..d8c6c46 100644
--- a/themes/neff/assets/scss/_header.scss
+++ b/themes/neff/assets/scss/_header.scss
@@ -11,10 +11,11 @@
         transition: $transition-time;
 
         .navbar-logo {
-            flex: 1 1 0;
+            flex: 0 1 0;
+            min-width: 100px;
 
             img {
-                max-height: 30px;
+                max-height: 25px;
                 transition: $transition-time * 1.5;
                 width: auto;
             }
@@ -34,7 +35,8 @@
         transition: $transition-time;
 
         .navbar-logo {
-            flex: 1 1 0;
+            flex: 0 1 0;
+            min-width: 100px;
 
             img {
                 max-height: 50px;
@@ -67,6 +69,7 @@
     
     .container {
         border-radius: 0 0 $border-radius $border-radius;
+        margin-bottom: 0;
     }
 
     .navbar {
@@ -74,8 +77,9 @@
         @extend .column;
         justify-content: space-between;
         align-items: stretch;
-        max-width: 40px;
         padding: 0 $gutter-width;
+        flex: 1 0 0;
+        min-width: 0;
 
         @media only screen and (min-width: $media-query) {
             max-width: none;
@@ -86,11 +90,16 @@
 
             & + label {
                 display: block;
+                margin-left: auto;
                 margin-top: $gutter-width;
-                margin-right: calc(2 * #{$gutter-width});
+                max-width: 35px;
+                max-height: 35px;
+                min-width: 35px;
+                min-height: 35px;
 
-                div {
+                .toggler {
                     position: relative;
+                    display: block;
                     cursor: pointer;
                     width: 35px;
                     height: 30px;
@@ -157,21 +166,15 @@
             }
         }
 
-        .navbar {
-            flex: 1 1 0;
-            @extend .flex;
-            @extend .column;
-            justify-content: end;
-            align-items: end;
-        }
-
         .navbar-container {
             margin-top: auto;
+            min-width: 0;
 
             nav {
                 @extend .flex;
                 @extend .column;
                 align-items: flex-end;
+                height: 100%;
 
 
                 @media only screen and (min-width: $media-query) {
@@ -182,7 +185,6 @@
 
                     ul {
                         @include menu-list(row);
-                        @include trim-list-margin-horizontal;
 
                         align-items: flex-end;
                         height: 100%;
@@ -208,6 +210,14 @@
                     }
                 }
             }
+
+            ul:last-child {
+                li {
+                    &:last-child {
+                        margin-right: 0;
+                    }
+                }
+            }
         }
     }
 }
diff --git a/themes/neff/assets/scss/_index.scss b/themes/neff/assets/scss/_index.scss
index c5f7dca..0553938 100644
--- a/themes/neff/assets/scss/_index.scss
+++ b/themes/neff/assets/scss/_index.scss
@@ -1,73 +1,78 @@
-#index-hero {
-    .hero-container {
-        text-align: center;
+#content {
+    #index-hero {
+        .hero-container {
+            text-align: center;
 
-        img.hero {
-            margin: 0.5rem auto 0;
-            max-width: 150px;
-            height: auto;
-        }
+            img.hero {
+                margin: 0.5rem auto 0;
+                max-width: 150px;
+                height: auto;
+            }
 
-        header,
-        div.content {
-            text-align: left;
-        }
-    }
-}
-
-#index-title {
-    display: none;
-}
-
-#index-short-contact {
-    font-size: 1.1rem;
-    align-items: top;
-    background-color: rgba(255, 255, 255, 0.9);
-    height: 90px;
-    border-radius: $border-radius;
-    padding: $gutter-width;
-    margin: calc(100vh - 310px) -$gutter-width 0 -$gutter-width;
-    overflow: none;
-    min-width: 100%;
-
-    @media only screen and (min-width: $media-query) {
-        margin-top: calc(100vh - 285px);
-        margin-bottom: -$gutter-width;
-        margin-left: 67%;
-        max-width: 33%;
-    }
-
-    ul {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-
-        li {
-            margin: 0.5rem $gutter-width;
-            font-size: 2rem;
+            header,
+            div.content {
+                text-align: left;
+            }
         }
     }
 
-    & > * {
-        flex: 1 0 0;
+    #index-title {
+        display: none;
     }
-}
 
-#index-contact {
-    .padding {
-        flex: 1 0 0;
+    #index-short-contact {
+        font-size: 1.1rem;
+        align-items: top;
+        background-color: rgba(255, 255, 255, 0.9);
+        height: 90px;
+        border-radius: $border-radius;
+        padding: $gutter-width;
+        margin: calc(100vh - 310px) -$gutter-width 0 -$gutter-width;
+        overflow: none;
+        min-width: 100%;
+
+        @media only screen and (min-width: $media-query) {
+            margin-top: calc(100vh - 285px);
+            margin-bottom: -$gutter-width;
+            margin-left: calc(#{$gutter-width} + calc(2 * calc(#{$max-width} / 3)));
+            margin-right: -$gutter-width;
+            padding-right: $gutter-width;
+            max-width: calc(#{$max-width} / 3);
+            min-width: calc(#{$max-width} / 3);
+        }
+
+        ul {
+            list-style: none;
+            padding: 0;
+            margin: 0;
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+
+            li {
+                margin: 0.5rem $gutter-width;
+                font-size: 2rem;
+            }
+        }
+
+        & > * {
+            flex: 1 0 0;
+        }
     }
-}
 
-#index-gallery {
-    figure {
-        text-align: center;
+    #index-contact {
+        .padding {
+            flex: 1 0 0;
+        }
+    }
 
-        figcaption {
-            text-align: left;
+    #index-gallery {
+        figure {
+            text-align: center;
+
+            figcaption {
+                text-align: left;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/themes/neff/assets/scss/_single.scss b/themes/neff/assets/scss/_single.scss
index b99a005..59abbdd 100644
--- a/themes/neff/assets/scss/_single.scss
+++ b/themes/neff/assets/scss/_single.scss
@@ -1,8 +1,4 @@
 #single {
-    ul.gallery{
-        margin: -#{$gutter-width};
-    }
-
     .single-footer {
         p {
             margin: 0;
@@ -35,20 +31,6 @@
     }
 }
 
-figure.left {
-    float: left;
-    margin-right: $gutter-width;
-    max-width: $min-column-width;
-    padding: 0.5rem 0;
-}
-
-figure.right {
-    float: right;
-    margin-left: $gutter-width;
-    max-width: $min-column-width;
-    padding: 0.5rem 0;
-}
-
 @media screen and (min-width: $media-query) {
     figure.left {
         max-width: $min-column-width-desktop;
diff --git a/themes/neff/layouts/_default/baseof.html b/themes/neff/layouts/_default/baseof.html
index 7b2bd25..e4a6b92 100755
--- a/themes/neff/layouts/_default/baseof.html
+++ b/themes/neff/layouts/_default/baseof.html
@@ -9,28 +9,28 @@
     {{- block "head" . -}}{{- end -}}
     <body>
         <div class="fixed-background background-{{ with .Params.background }}{{- . -}}{{- else -}}default{{- end -}}"></div>
-        <section id="header" class="large">
+        <div id="header" class="large">
             <div class="container">
                 {{- partial "header.html" . -}}
             </div>
-        </section>
+        </div>
         {{- if eq .Kind "home" -}}
             {{- partial "banner.html" . -}}
         {{- end -}}
         <div id="page-wrapper">
-            <section id="content">
+            <div id="content">
                 {{- block "content" . -}}
                     <div class="container">
                         {{- block "main" . -}}{{- end -}}
                     </div>
                 {{- end -}}
-            </section>
-            <section id="footer">
+            </div>
+            <div id="footer">
                 {{- partial "footer.html" . -}}
-            </section>
+            </div>
+        </div>
+        <div id="lightbox-section">
         </div>
-        <section id="lightbox-section">
-        </section>
         {{- partial "lightbox.html" . -}}
         {{- partial "scripts.html" . -}}
         {{- block "scripts" . -}}{{- end -}}
diff --git a/themes/neff/layouts/index.html b/themes/neff/layouts/index.html
index c8f968b..55a6be2 100755
--- a/themes/neff/layouts/index.html
+++ b/themes/neff/layouts/index.html
@@ -1,7 +1,7 @@
 {{ define "content" }}
     <div id="index">
         <div class="container transparent">
-            <section class="flex row">
+            <div class="flex row">
                 <div id="index-short-contact">
                     <div class="phone">
                         <i class="fa fa-phone"></i>: {{ (index .Site.Data.kontakt.kontakt 0).telephone }}
@@ -14,7 +14,7 @@
                         {{ partial "social.html" . }}
                     </div>
                 </div>
-            </section>
+            </div>
         </div>
 
         {{- with .Content -}}
@@ -86,7 +86,7 @@
 
         <div class="container">
             <section id="index-news">
-                <h1 class="padding"><a class="anchor" id="{{ i18n "news" }}"></a>{{ i18n "news" | title}}</a></h1>
+                <h1 class="padding"><a class="anchor" id="{{ i18n "news" }}">{{ i18n "news" | title}}</a></h1>
                 <ul class="list-unstyled flex row">
                     {{- range (first 3 (where .Site.Pages.ByWeight ".Params.type" "news")) -}}
                         {{- partial "news.html" . -}}
diff --git a/themes/neff/layouts/partials/address.html b/themes/neff/layouts/partials/address.html
index 3b2d7de..99b5064 100755
--- a/themes/neff/layouts/partials/address.html
+++ b/themes/neff/layouts/partials/address.html
@@ -1,8 +1,8 @@
-<div class="padding">
+<section class="address padding">
+    <header>
+        <h3>{{ .address.address.addressLocality }}</h3>
+    </header>
     <address class="address">
-        <header>
-            <h3>{{ .address.address.addressLocality }}</h3>
-        </header>
         {{ with .address.name }}<span>{{ . }}</span>{{ end }}
         <div>
             {{ with .address.address.streetAddress }}<span>{{ . }}</span><br>{{ end }}
@@ -45,4 +45,4 @@
         {{ partial "schema/localbusiness.html" (dict "contact" .address "ctx" .ctx "short" false) }}
     </address>
     <a href="https://maps.openrouteservice.org/directions?n1={{ .address.geo.lat }}&n2={{ .address.geo.lon }}&n3=13&a=null,null,{{ .address.geo.lat }},{{ .address.geo.lon }}&b=0&k1=de-DE&k2=km"><i class="fa fa-map"></i> Zum Routenplaner</a>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/themes/neff/layouts/partials/footer.html b/themes/neff/layouts/partials/footer.html
index 1016fa6..5e02e23 100755
--- a/themes/neff/layouts/partials/footer.html
+++ b/themes/neff/layouts/partials/footer.html
@@ -19,12 +19,29 @@
     </div>
 {{- end }}
 <div class="container bottom">
-    <div class="flex column">
         <div id="footer-social" class="padding"> 
             {{- partial "social.html" . -}}
         </div>    
-        <ul id="footer-menu">
-            {{ partial "menu.html" (dict "menu" .Site.Menus.footer "ctx" .) }}
-        </ul>
-    </div>
+        <nav class="padding">
+            {{- $currentPage := . -}}
+            {{- range .Site.Menus.footer -}}
+            <ul>
+                {{- if .HasChildren -}}
+                    <li class="{{ if $currentPage.HasMenuCurrent .Menu . }}active{{ end }}">
+                        <a href="{{ .URL }}">
+                            {{ .Pre }}
+                            <span>{{ .Name }}</span>
+                        </a>
+                        <ul class="sub-menu">
+                            {{- range .Children -}}
+                                {{ partial "menu-item.html" (dict "item" . "ctx" $currentPage)}}
+                            {{- end -}}
+                        </ul>
+                    </li>
+                {{- else -}}
+                    {{ partial "menu-item.html" (dict "item" . "ctx" $currentPage)}}
+                {{- end -}}
+            </ul>
+            {{- end -}}
+        </nav>
 </div>
\ No newline at end of file
diff --git a/themes/neff/layouts/partials/header.html b/themes/neff/layouts/partials/header.html
index 5164759..7bfe38d 100755
--- a/themes/neff/layouts/partials/header.html
+++ b/themes/neff/layouts/partials/header.html
@@ -4,16 +4,33 @@
             <picture>
                 <source srcset="/img/logo.svg"
                         media="(min-width: 960px)">
-                <img src="/img/logo-klein.svg" />
+                <img src="/img/logo-klein.svg" alt="Logo der Firma Neff Stein-Design" />
             </picture>
         </a>
     </div>
     <div class="navbar small">
-        <input type="checkbox" class="hamburger" id="top-navigation-checkbox" name="top-navigation-checkbox"><label class="hamburger" for="top-navigation-checkbox"><div><span class="line"></span><span class="line"></span><span class="line"></span></div></label>
+        <input type="checkbox" class="hamburger" id="top-navigation-checkbox" name="top-navigation-checkbox"><label class="hamburger" for="top-navigation-checkbox"><span class="toggler"><span class="line"></span><span class="line"></span><span class="line"></span></span></label>
         <div class="navbar-container">
             <nav>
-                <ul class="menu-list">
-                    {{ partial "menu.html" (dict "menu" .Site.Menus.main "ctx" .) }}
+                <ul>
+                    {{- $currentPage := . -}}
+                    {{- range .Site.Menus.main -}}
+                        {{- if .HasChildren -}}
+                            <li class="{{ if $currentPage.HasMenuCurrent .Menu . }}active{{ end }}">
+                                <a href="{{ .URL }}">
+                                    {{ .Pre }}
+                                    <span>{{ .Name }}</span>
+                                </a>
+                                <ul class="sub-menu">
+                                    {{- range .Children -}}
+                                        {{ partial "menu-item.html" (dict "item" . "ctx" $currentPage)}}
+                                    {{- end -}}
+                                </ul>
+                            </li>
+                        {{- else -}}
+                            {{ partial "menu-item.html" (dict "item" . "ctx" $currentPage)}}
+                        {{- end -}}
+                    {{- end -}}
                 </ul>
             </nav>
         </div>
diff --git a/themes/neff/layouts/partials/img.html b/themes/neff/layouts/partials/img.html
index 9722285..a5b400a 100644
--- a/themes/neff/layouts/partials/img.html
+++ b/themes/neff/layouts/partials/img.html
@@ -20,7 +20,7 @@
     <img alt="{{ $alt }}" 
         title="{{ $title }}"
         srcset="{{ $imageSm.RelPermalink }} 300w, {{ $imageMd.RelPermalink }} 500w"
-        sizes="(max-width: 500px) 300w, 500w"
+        sizes="(max-width: 500px) 300px, 500px"
         src="{{ $imageMd.RelPermalink }}" />
 {{ end }}
 {{- partial "schema/img.html" (dict "image" . "ctx" $ctx) -}}
diff --git a/themes/neff/layouts/partials/lightbox.html b/themes/neff/layouts/partials/lightbox.html
index 2ce79d4..ec9574a 100644
--- a/themes/neff/layouts/partials/lightbox.html
+++ b/themes/neff/layouts/partials/lightbox.html
@@ -9,8 +9,16 @@
             </div>
             <div class="lightbox-image">
                 <div class="image-container">
-                    <a class="lightbox-prev"><div class="lightbox-nav-prev"><div><i class="fa fa-chevron-left"></div></i></div></a>
-                    <a class="lightbox-next"><div class="lightbox-nav-next"><div><i class="fa fa-chevron-right"></div></div></i></a>
+                    <a class="lightbox-prev">
+                        <div class="lightbox-nav-prev">
+                            <div><i class="fa fa-chevron-left"></i></div>
+                        </div>
+                    </a>
+                    <a class="lightbox-next">
+                        <div class="lightbox-nav-next">
+                            <div><i class="fa fa-chevron-right"></i></div>
+                        </div>
+                    </a>
                     <img src="#" alt="image">
                 </div>
             </div>
diff --git a/themes/neff/layouts/partials/menu.html b/themes/neff/layouts/partials/menu.html
index 6c5d460..ad68bd2 100755
--- a/themes/neff/layouts/partials/menu.html
+++ b/themes/neff/layouts/partials/menu.html
@@ -1,5 +1,6 @@
 {{- $currentPage := .ctx -}}
 {{- range .menu -}}
+<ul>
     {{- if .HasChildren -}}
         <li class="{{ if $currentPage.HasMenuCurrent .Menu . }}active{{ end }}">
             <a href="{{ .URL }}">
@@ -15,4 +16,5 @@
     {{- else -}}
         {{ partial "menu-item.html" (dict "item" . "ctx" $currentPage)}}
     {{- end -}}
+</ul>
 {{- end -}}
diff --git a/themes/neff/layouts/partials/scripts.html b/themes/neff/layouts/partials/scripts.html
index 1b36ee9..896411d 100644
--- a/themes/neff/layouts/partials/scripts.html
+++ b/themes/neff/layouts/partials/scripts.html
@@ -3,4 +3,4 @@
 </script>
 {{- $js := resources.Get "js/bundle.js" -}}
 {{- $js = $js | resources.Fingerprint -}}
-<script type="text/javascript" src="{{ $js.Permalink }}" integrity="{{ $js.Data.Integrity }}"></script>
\ No newline at end of file
+<script src="{{ $js.Permalink }}" integrity="{{ $js.Data.Integrity }}"></script>
\ No newline at end of file