diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 5edc6399..6155a36c 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -11,21 +11,19 @@
         <div class="container flex-fill" id="paige-root">
             <div class="row">
                 <div class="col">
-                    {{ partial "paige/site-header.html" $page }}
-
                     <main class="mt-3" id="paige-main">
                         {{ if templates.Exists "partials/paige/main-first.html" }}
                             {{ partial "paige/main-first.html" $page }}
                         {{ end }}
 
+                        {{ partial "paige/site-header.html" $page }}
                         {{ block "main" $page }}{{ end }}
+                        {{ partial "paige/site-footer.html" $page }}
 
                         {{ if templates.Exists "partials/paige/main-last.html" }}
                             {{ partial "paige/main-last.html" $page }}
                         {{ end }}
                     </main>
-
-                    {{ partial "paige/site-footer.html" $page }}
                 </div>
             </div>
         </div>
diff --git a/layouts/partials/paige/site-header.html b/layouts/partials/paige/site-header.html
index 794adc30..fe53cd8b 100644
--- a/layouts/partials/paige/site-header.html
+++ b/layouts/partials/paige/site-header.html
@@ -29,7 +29,7 @@
 {{ end }}
 
 {{ if or $page.Ancestors site.Menus.main }}
-    <header class="mt-3" id="paige-header">
+    <header class="my-3" id="paige-header">
         {{ if templates.Exists "partials/paige/header-first.html" }}
             {{ partial "paige/header-first.html" $page }}
         {{ end }}