diff --git a/themes/neff/assets/scss/_footer.scss b/themes/neff/assets/scss/_footer.scss
index 6db7036..7b76d15 100644
--- a/themes/neff/assets/scss/_footer.scss
+++ b/themes/neff/assets/scss/_footer.scss
@@ -1,8 +1,13 @@
 #footer {
-    & > .container {
+    .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);
         align-items: flex-end;
diff --git a/themes/neff/layouts/_default/baseof.html b/themes/neff/layouts/_default/baseof.html
index f91552f..960f3bf 100755
--- a/themes/neff/layouts/_default/baseof.html
+++ b/themes/neff/layouts/_default/baseof.html
@@ -22,9 +22,7 @@
                 {{- end -}}
             </section>
             <section id="footer">
-                <div class="container">
-                    {{- partial "footer.html" . -}}
-                </div>
+                {{- partial "footer.html" . -}}
             </section>
         </div>
         <section id="lightbox-section">
diff --git a/themes/neff/layouts/index.html b/themes/neff/layouts/index.html
index 7fa730a..4e2ced4 100755
--- a/themes/neff/layouts/index.html
+++ b/themes/neff/layouts/index.html
@@ -34,10 +34,10 @@
         {{- end -}}
 
         <div class="container">
-            <section id="index-hero">
+            <section id="index-about">
                 <a class="anchor" id="{{ i18n "about-us" }}"><h1 class="padding">{{ (replace (replace (i18n "about-us") "-" " ") "ue" "ü") | title}}</h1></a>
                 <div class="flex row">
-                    {{- range (first 3 (where .Site.Pages.ByWeight ".Params.type" "hero")) -}}
+                    {{- range (first 3 (where .Site.Pages.ByWeight ".Params.type" "ueber-uns")) -}}
                         <div>
                             {{- partial "hero.html" . -}}
                         </div>
diff --git a/themes/neff/layouts/partials/footer.html b/themes/neff/layouts/partials/footer.html
index 0458b00..54944e1 100755
--- a/themes/neff/layouts/partials/footer.html
+++ b/themes/neff/layouts/partials/footer.html
@@ -1,8 +1,30 @@
-<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>
+{{- if (ne .Kind "home") -}}
+    <div class="container">
+        <section id="index-contact">
+            <div>
+                <a class="anchor" id="{{ i18n "contact" }}"><h1 class="padding">Kontakt</h1></a>
+                <div class="call-to-action flex row text-center">
+                    <div class="padding">
+                        <a class="btn btn-primary" href="mailto:{{ .Site.Author.email }}">{{ i18n "send-mail" }}</a>
+                    </div>
+                </div>
+                <div class="flex row">
+                    {{- $site := . }}
+                    {{- range .Site.Data.contact.contact -}}
+                        {{- partial "address.html" (dict "address" . "ctx" $site) -}}
+                    {{- end -}}
+                </div>
+            </div>
+        </section>
+    </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>
 </div>
\ No newline at end of file
diff --git a/themes/neff/layouts/partials/single.html b/themes/neff/layouts/partials/single.html
index 2cc27dd..c6ae113 100755
--- a/themes/neff/layouts/partials/single.html
+++ b/themes/neff/layouts/partials/single.html
@@ -8,7 +8,7 @@
             {{- range $.Resources.ByType "image" -}}
                 {{- if .Params.featured -}}
                     {{- $orig := . -}}
-                    {{ partial "figure.html" (dict "ctx" . "image" . "lightbox" true "class" "featured left")}}
+                    {{ partial "figure.html" (dict "ctx" . "image" . "lightbox" true "class" "featured left" "showTitle" true "showDescription" true)}}
                 {{- end -}}
             {{- end -}}
             {{ . }}