diff --git a/content/theme/templates/blogindex.html b/content/theme/templates/blogindex.html
index 18e2819..221224b 100644
--- a/content/theme/templates/blogindex.html
+++ b/content/theme/templates/blogindex.html
@@ -1,6 +1,6 @@
 <div id="contents">
     <div class="bg-white p-5 rounded">
-        <div class="col-sm-8 mx-auto">
+        <div class="col-sm-12 mx-auto">
 
             <h3>Welcome to the Tooling Blog!</h3>
             <p><i>Here you will find tooling updates</i></p>
diff --git a/content/theme/templates/frontpage.html b/content/theme/templates/frontpage.html
index 7d8f212..8888db9 100644
--- a/content/theme/templates/frontpage.html
+++ b/content/theme/templates/frontpage.html
@@ -1,7 +1,7 @@
 <!-- page contents -->
 <div id="contents">
   <div class="bg-white p-5 rounded">
-    <div class="col-sm-8 mx-auto">
+    <div class="col-sm-12 mx-auto">
       {{ page.content }}
     </div>
   </div>
diff --git a/content/theme/templates/generic.html b/content/theme/templates/generic.html
index 95de3e5..f5448c8 100644
--- a/content/theme/templates/generic.html
+++ b/content/theme/templates/generic.html
@@ -1,7 +1,7 @@
 <!-- page contents -->
 <div id="contents">
     <div class="bg-white p-5 rounded">
-        <div class="col-sm-8 mx-auto">
+        <div class="col-sm-12 mx-auto">
           <h1>
             {% if article %}
             {{ article.title }}
diff --git a/content/theme/templates/menu.html b/content/theme/templates/menu.html
index ec28c25..1256942 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 fixed-top" aria-label="Fifth navbar example">
+<nav class="navbar navbar-expand-md 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;">
@@ -8,20 +8,21 @@
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarADP" aria-controls="navbarADP" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-
     <div class="collapse navbar-collapse" id="navbarADP" style="position: relative; top: 4px; margin-left: 16px;">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+      <ul class="navbar-nav me-auto">
         <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Team</a>
+          <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">About</a>
           <ul class="dropdown-menu">
             <!--<li><a class="dropdown-item" href="/blog/">Tooling Blog</a></li>-->
             <li><a class="dropdown-item" href="/team.html">About the team</a></li>
+            <li><a class="dropdown-item" href="/volunteer.html">Volunteer with Tooling</a></li>
+            <li><a class="dropdown-item" href="/job-posting.html">Job Posting</a></li>
+            <li><hr class="dropdown-divider"></li>
             <li><a class="dropdown-item" href="/trusted-releases.html">Trusted Releases</a></li>
             <li><a class="dropdown-item" href="/supply-chain.html">Supply Chain Attacks FAQ</a></li>
             <li><a class="dropdown-item" href="/policies.html">Policies</a></li>
           </ul>
         </li>
-
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Tools</a>
           <ul class="dropdown-menu">
@@ -29,9 +30,8 @@
             <li><a class="dropdown-item" href="https://agenda.apache.org">Board Agenda Tool</a></li>
           </ul>
         </li>
-
         <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Repositories</a>
+          <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Source</a>
           <ul class="dropdown-menu">
             <li><a class="dropdown-item" href="https://github.com/apache/tooling-docs/">Documentation Website</a></li>
             <li><a class="dropdown-item" href="https://github.com/apache/tooling-secretary">Secretary's Workbench</a></li>
@@ -41,15 +41,6 @@
             <li><a class="dropdown-item" href="https://github.com/apache/tooling-agenda">Agenda Tool</a></li>
           </ul>
         </li>
-
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Contribute</a>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" href="/volunteer.html">Volunteer with Tooling</a></li>
-            <li><a class="dropdown-item" href="/job-posting.html">Job Posting</a></li>
-          </ul>
-        </li>
-
         <li class="nav-item dropdown">
           <a href="#" class="nav-link dropdown-toggle hidden-xs" data-bs-toggle="dropdown"><span class="fa-solid fa-magnifying-glass" aria-hidden="true"></span> Search</a>
           <ul class="search-form dropdown-menu">
@@ -59,22 +50,23 @@
           </ul>
         </li>
       </ul>
-      <div class="nav-item dropdown active">
-        <a class="nav-link dropdown-toggle" href="#"
-           role="button" data-bs-toggle="dropdown" aria-expanded="false">
-          About The ASF
-        </a>
-        <div class="dropdown-menu dropdown-menu-end">
-          <a class="dropdown-item" href="https://www.apache.org/">Foundation</a>
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
-          <a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-          <a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
-          <a class="dropdown-item" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy</a>
-        </div>
-      </div>
+      <ul class="navbar-nav">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            About The ASF
+          </a>
+          <ul class="dropdown-menu dropdown-menu-end">
+            <li><a class="dropdown-item" href="https://www.apache.org/">Foundation</a></li>
+            <li><hr class="dropdown-divider"></li>
+            <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
+            <li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+            <li><hr class="dropdown-divider"></li>
+            <li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
+            <li><a class="dropdown-item" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy</a></li>
+          </ul>
+        </li>
+      </ul>
     </div>
   </div>
 </nav>
diff --git a/content/theme/templates/styles.html b/content/theme/templates/styles.html
index d48e645..b58705d 100644
--- a/content/theme/templates/styles.html
+++ b/content/theme/templates/styles.html
@@ -28,7 +28,7 @@
 <!-- pagefind search box styling -->
 <style>
   body {
-      padding-top: 56px;
+      padding-top: 44px;
   }
   .search-form {
       right: 0;