diff --git a/config/_default/config.yaml b/config/_default/config.yaml
index 4acf248..95396b7 100644
--- a/config/_default/config.yaml
+++ b/config/_default/config.yaml
@@ -19,12 +19,12 @@ params:
   slogan: we love Swift!
   headerTitle: Einführung in Swift und SwiftUI
 
-  switches:
-    # Layout
+  layout:
     fixedHeader: true
     fixedFooter: true
 
-    stickyHeader: false
+    # stickyHeader: true
+  switches:
 
     # Admin
     #   Layout
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index b0850f5..aa1cf55 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
 <!-- partial footer.html -->
 
 <!-- Fixed footer -->
-{{ if .Site.Params.fixedFooter }}
+{{ if .Site.Params.Layout.fixedFooter }}
     <div class="fixed-bottom">
 {{ else }}
     <div>
@@ -44,4 +44,5 @@
 </div>
 </div>
 </div>
+
 </div>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b83a8ed..71ea1ce 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -4,14 +4,15 @@
 <!-- text-Color: https://getbootstrap.com/docs/5.0/utilities/colors/#colors -->
 
 <!-- Fixed header -->
-{{ if .Site.Params.fixedHeader }}
+{{ if .Site.Params.Layout.fixedHeader }}
     <div class="fixed-top">
 {{ else }}
     <div>
 {{ end }}
 
 <div class="csBorder">
-<div class="container-fluid rounded bg-warning px-2 pb-2 ">
+<div class="container-fluid rounded bg-warning">
+<div class="px-2 pb-2">
     <!-- position-sticky -->
     <div class="row">
         <div class="col">
@@ -133,4 +134,6 @@
     </div>
 </div>
 </div>
+</div>
+
 </div>
\ No newline at end of file
diff --git a/layouts/partials/layout/fixed-header-fixed-footer.html b/layouts/partials/layout/fixed-header-fixed-footer.html
index 2210b08..00f7105 100644
--- a/layouts/partials/layout/fixed-header-fixed-footer.html
+++ b/layouts/partials/layout/fixed-header-fixed-footer.html
@@ -1,25 +1,35 @@
 <!-- partial fixed-header-fixed-footer.html -->
 
-{{ with .Site.Params }}
+<!-- Used in baseof.html -->
+
+{{ with .Site.Params.Layout }}
 
     <!-- fixed header, fixed footer -->
-    {{ if ( and .fixedHeader .fixedFooter ) }}
+    {{ if .fixedHeader }} 
+    {{ if .fixedFooter }}
         <main class="mt-5 pt-5 mb-5 pb-2" >
     {{ end }}
+    {{ end }}
 
     <!-- header, fixed footer -->
-    {{ if ( and ( not .fixedHeader ) .fixedFooter ) }}
+    {{ if not .fixedHeader }} 
+    {{ if .fixedFooter }}
         <main class="mt-0 pt-2 mb-5 pb-2">
     {{ end }}
+    {{ end }}
 
     <!-- fixed header, footer -->
-    {{ if ( and .fixedHeader ( not .fixedFooter ) ) }}
+    {{ if .fixedHeader }} 
+    {{ if not .fixedFooter }}
         <main class="mt-5 pt-5 mb-0 pb-2">
     {{ end }}
+    {{ end }}
 
     <!-- header, footer -->
-    {{ if ( and ( not .fixedHeader ) ( not .fixedFooter ) ) }}
+    {{ if not .fixedHeader }}
+    {{ if not .fixedFooter }}
         <main class="mt-0 pt-2 mb-0 pb-2">
     {{ end }}
+    {{ end }}
 
 {{ end }}
\ No newline at end of file