diff --git a/src/css/base.css b/src/css/base.css
index e4823bf..d694722 100644
--- a/src/css/base.css
+++ b/src/css/base.css
@@ -125,3 +125,21 @@ body ::-webkit-scrollbar-thumb {
   max-width: 1280px;
   margin: 0 auto;
 }
+
+/** pseudo-tailwind classes */
+
+.flex {
+  display: flex;
+}
+
+.flex-col {
+  flex-direction: column;
+}
+
+.m-0 {
+  margin: 0;
+}
+
+.justify-between {
+  justify-content: space-between;
+}
diff --git a/src/css/header.css b/src/css/header.css
index 2044138..f9588e2 100644
--- a/src/css/header.css
+++ b/src/css/header.css
@@ -283,7 +283,7 @@ body {
     transition: max-height 0.2s ease, padding 0.2s ease;
   }
 
-  .navbar-sub .container {
+  .navbar-sub .navlinks {
     flex-direction: column;
   }
 
diff --git a/src/css/page-versions.css b/src/css/page-versions.css
index 5658aae..da09d53 100644
--- a/src/css/page-versions.css
+++ b/src/css/page-versions.css
@@ -11,16 +11,23 @@
 }
 
 .page-versions .version-menu-toggle {
-  color: inherit;
+  color: var(--color-white);
   background: url(../img/chevron.svg) no-repeat;
   background-position: right 0.5rem top 50%;
   background-size: auto 0.75em;
   border: none;
   outline: none;
   line-height: inherit;
-  padding: 0.5rem 1.5rem 0.5rem 0.5rem;
+  padding: 7px 1.5rem 7px 30px;
   position: relative;
-  z-index: var(--z-index-page-version-menu);
+  z-index: var(--z-index-page-version-menu-button);
+  font-size: 16px;
+  opacity: 0.8;
+}
+
+.page-versions .version-menu-toggle:hover {
+  opacity: 1;
+  text-decoration: none;
 }
 
 .page-versions .version-menu {
@@ -34,6 +41,9 @@
   top: 0;
   right: 0;
   white-space: nowrap;
+  z-index: var(--z-index-page-version-menu);
+  color: var(--color-white);
+  font-size: 16px;
 }
 
 .page-versions:not(.is-active) .version-menu {
@@ -41,11 +51,13 @@
 }
 
 .page-versions .version {
+  color: var(--color-white);
   display: block;
   padding-top: 0.5rem;
 }
 
 .page-versions .version.is-current {
+  color: var(--color-white);
   display: none;
 }
 
diff --git a/src/css/vars.css b/src/css/vars.css
index 41c65bf..1d6d6ed 100644
--- a/src/css/vars.css
+++ b/src/css/vars.css
@@ -58,7 +58,7 @@
   --toolbar-border-color: var(--panel-border-color);
   --toolbar-font-color: var(--color-jet-30);
   --toolbar-muted-color: var(--color-gray-30);
-  --page-version-menu-background: var(--color-smoke-70);
+  --page-version-menu-background: var(--color-jet-70);
   --page-version-missing-font-color: var(--color-gray-30);
   /* admonitions */
   --caution-color: #a0439c;
@@ -140,5 +140,6 @@
   --z-index-nav: 1;
   --z-index-toolbar: 2;
   --z-index-page-version-menu: 3;
-  --z-index-navbar: 4;
+  --z-index-page-version-menu-button: 4;
+  --z-index-navbar: 5;
 }
diff --git a/src/img/chevron.svg b/src/img/chevron.svg
index 836c90f..f1bfde9 100644
--- a/src/img/chevron.svg
+++ b/src/img/chevron.svg
@@ -53,7 +53,7 @@
      id="layer1"
      transform="translate(0,-1022.3622)">
     <path
-       style="opacity:1;fill:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 3.6699219,6.5898438 1.4550781,8.6152344 15,23.374272 28.544922,8.6152344 26.330078,6.5898438 15,18.759498 Z"
        transform="translate(0,1022.3622)"
        id="rect4136"
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index d67ac43..b40c124 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -1,29 +1,30 @@
 <header class="header">
   <nav class="navbar">
     <div class="container">
-    <div class="navbar-brand">
-      <a class="navbar-item" href="https://stackable.tech/en/">{{!--site.title--}}<img src="{{{uiRootPath}}}/img/stackable-logo.png"></a>
-      <a class="navbar-item documentation-link" href="{{{or site.homeUrl site.url}}}">Documentation</a>
-      {{#if env.SITE_SEARCH_PROVIDER}}
-      <div class="navbar-item search hide-for-print">
-        <div id="search-field" class="field">
-          <input id="search-input" type="text" placeholder="Search..."{{#if page.home}} autofocus{{/if}}>
+      <div class="navbar-brand">
+        <a class="navbar-item" href="https://stackable.tech/en/">{{!--site.title--}}<img src="{{{uiRootPath}}}/img/stackable-logo.png"></a>
+        <a class="navbar-item documentation-link" href="{{{or site.homeUrl site.url}}}">Documentation</a>
+        {{#if env.SITE_SEARCH_PROVIDER}}
+        <div class="navbar-item search hide-for-print">
+          <div id="search-field" class="field">
+            <input id="search-input" type="text" placeholder="Search..."{{#if page.home}} autofocus{{/if}}>
+          </div>
         </div>
+        {{/if}}
+        <button class="navbar-burger" data-target="navbar-sub">
+          <span></span>
+          <span></span>
+          <span></span>
+        </button>
+        <a href="https://www.stackable.tech/en/contact/" class="button pull-right">Contact Us</a>
       </div>
-      {{/if}}
-      <button class="navbar-burger" data-target="navbar-sub">
-        <span></span>
-        <span></span>
-        <span></span>
-      </button>
-      <a href="https://www.stackable.tech/en/contact/" class="button pull-right">Contact Us</a>
-    </div>
       <div id="topbar-nav" class="navbar-menu">
       </div>
-      </div>
-    </nav>
-    <nav id="navbar-sub" class="navbar-sub">
-      <div class="container">
+    </div>
+  </nav>
+  <nav id="navbar-sub" class="navbar-sub">
+    <div class="container justify-between">
+      <div class="navlinks flex m-0">
         {{#> navbar }}
           navbar.hbs partial not found - you're seeing failover content
           <a class="navbar-sub-item" href="#">Home</a>
@@ -35,10 +36,22 @@
               </div>
           </div>
         {{/navbar}}
-
         <a class="arrow" href="javascript:document.querySelector('.navbar-sub').classList.toggle('open')">
           <svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="arrow-right" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" data-fa-i2svg=""><path fill="currentColor" d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"></path></svg>
         </a>
       </div>
-    </nav>
-  </header>
+      {{#with @root.page.versions}}
+      <div class="page-versions">
+        <button class="version-menu-toggle" title="Show other versions of page">{{@root.page.componentVersion.displayVersion}}</button>
+        <div class="version-menu">
+          {{#each this}}
+          <a class="version
+            {{~#if (eq ./version @root.page.version)}} is-current{{/if~}}
+            {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize ./url}}}">{{./displayVersion}}</a>
+          {{/each}}
+        </div>
+      </div>
+      {{/with}}
+    </div>
+  </nav>
+</header>
diff --git a/src/partials/nav-menu.hbs b/src/partials/nav-menu.hbs
index b77ee40..29e9220 100644
--- a/src/partials/nav-menu.hbs
+++ b/src/partials/nav-menu.hbs
@@ -5,18 +5,6 @@
       {{#with @root.page.componentVersion}}
       <h3 class="title"><a href="{{{relativize ./url}}}">{{./title}}</a></h3>
       {{/with}}
-      {{#with @root.page.versions}}
-      <div class="page-versions">
-        <button class="version-menu-toggle" title="Show other versions of page">{{@root.page.componentVersion.displayVersion}}</button>
-        <div class="version-menu">
-          {{#each this}}
-          <a class="version
-            {{~#if (eq ./version @root.page.version)}} is-current{{/if~}}
-            {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize ./url}}}">{{./displayVersion}}</a>
-          {{/each}}
-        </div>
-      </div>
-      {{/with}}
     </div>
     {{> nav-tree navigation=this}}
   </nav>