diff --git a/content/theme/templates/article.html b/content/theme/templates/article.html
index a70662c..d64eeb4 100644
--- a/content/theme/templates/article.html
+++ b/content/theme/templates/article.html
@@ -9,15 +9,13 @@
     {% include "styles.html" %}
   </head>
   <body class="d-flex flex-column h-100">
-  <main class="flex-shrink-0">
     {% include "menu.html" %}
-    {% include "breadcrumbs.html" %}
-
-    {% include "generic.html" %}
-
-    {% include "footer.html" %}
-  </main>
-  {% include "post.html" %}
+    <main class="flex-shrink-0">
+      {% include "breadcrumbs.html" %}
+      {% include "generic.html" %}
+      {% include "footer.html" %}
+    </main>
+    {% include "post.html" %}
   </body>
 </html>
 {% endblock %}
diff --git a/content/theme/templates/blog.html b/content/theme/templates/blog.html
index 098a0ac..1075153 100644
--- a/content/theme/templates/blog.html
+++ b/content/theme/templates/blog.html
@@ -1,23 +1,23 @@
 {% block head %}
-    <!doctype html>
-    <html class="no-js" lang="en" dir="ltr">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Blogs - {{SITENAME}}</title>
-        {% include "styles.html" %}
-    </head>
-    <body class="d-flex flex-column h-100">
+<!doctype html>
+<html class="no-js" lang="en" dir="ltr">
+  <head>
+      <meta charset="utf-8">
+      <meta http-equiv="x-ua-compatible" content="ie=edge">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <title>Blogs - {{SITENAME}}</title>
+      {% include "styles.html" %}
+  </head>
+  <body class="d-flex flex-column h-100">
+    {% include "menu.html" %}
     <main class="flex-shrink-0">
         <div>
-            {% include "menu.html" %}
             {% include "breadcrumbs.html" %}
             {% include "blogindex.html" %}
             {% include "footer.html" %}
         </div>
     </main>
     {% include "post.html" %}
-    </body>
-    </html>
+  </body>
+</html>
 {% endblock %}
diff --git a/content/theme/templates/index.html b/content/theme/templates/index.html
index 5c70b20..d7feb70 100644
--- a/content/theme/templates/index.html
+++ b/content/theme/templates/index.html
@@ -9,9 +9,9 @@
     {% include "styles.html" %}
   </head>
   <body class="d-flex flex-column h-100">
+    {% include "menu.html" %}
     <main class="flex-shrink-0">
       <div>
-        {% include "menu.html" %}
         {% include "frontpage.html" %}
         {% include "footer.html" %}
       </div>
diff --git a/content/theme/templates/menu.html b/content/theme/templates/menu.html
index 9609ac9..ec28c25 100644
--- a/content/theme/templates/menu.html
+++ b/content/theme/templates/menu.html
@@ -1,5 +1,5 @@
 <!-- nav bar -->
-<nav class="navbar navbar-expand-lg navbar-light bg-info" aria-label="Fifth navbar example">
+<nav class="navbar navbar-expand-lg navbar-light bg-info fixed-top" aria-label="Fifth navbar example">
   <div class="container-fluid">
     <a class="navbar-brand" href="/">
       <img src="https://apache.org/img/asf_logo.png" alt="The Apache Software Foundation" style="height: 42px;">
diff --git a/content/theme/templates/page.html b/content/theme/templates/page.html
index e59cc2e..d1711a8 100644
--- a/content/theme/templates/page.html
+++ b/content/theme/templates/page.html
@@ -9,9 +9,9 @@
     {% include "styles.html" %}
   </head>
   <body class="d-flex flex-column h-100">
+    {% include "menu.html" %}
     <main class="flex-shrink-0">
       <div>
-        {% include "menu.html" %}
         {% include "generic.html" %}
         {% include "footer.html" %}
       </div>
diff --git a/content/theme/templates/styles.html b/content/theme/templates/styles.html
index 8a694a6..d48e645 100644
--- a/content/theme/templates/styles.html
+++ b/content/theme/templates/styles.html
@@ -27,6 +27,9 @@
 </script>
 <!-- pagefind search box styling -->
 <style>
+  body {
+      padding-top: 56px;
+  }
   .search-form {
       right: 0;
       left: initial !important;
