diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less
index 2e422cede6..ed5aea2488 100644
--- a/website/assets/styles/layout.less
+++ b/website/assets/styles/layout.less
@@ -291,6 +291,7 @@ html, body {
     background-color: @core-vibrant-red;
     text-decoration: none;
     white-space: nowrap;
+    overflow: hidden;
     &:hover {
       color: #FFF;
     }
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index 197f2dfb02..c9d22f1dcf 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -394,18 +394,18 @@
                     </div>
                     <% if(_.has(me, 'id')) {%>
                       <hr>
-                      <a purpose="mobile-dropdown-link" href="/logout" class="d-flex mt-2 text-decoration-none">Log out</a>
+                      <a purpose="mobile-dropdown-toggle" href="/logout" class="d-flex mt-2 text-decoration-none">Log out</a>
                     <% }%>
+                    <%if(me && me.isSuperAdmin && showAdminLinks) {%>
+                      <hr>
+                      <a purpose="mobile-dropdown-toggle" class="d-flex align-items-center mr-4 collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleAdmin">Admin</a>
+                      <div id="mobileNavbarToggleAdmin" purpose="mobile-dropdown" class="collapse" data-parent="#mobileDropdowns">
+                        <a purpose="mobile-dropdown-link" href="/query-generator">Generate queries</a>
+                        <a purpose="mobile-dropdown-link" href="/admin/generate-license">License generator</a>
+                        <a purpose="mobile-dropdown-link" href="/admin/email-preview">HTML Email preview tool</a>
+                      </div>
+                    <%}%>
                   </div>
-                  <%if(me && me.isSuperAdmin && showAdminLinks) {%>
-                    <hr>
-                    <a purpose="mobile-dropdown-toggle" class="d-flex align-items-center mr-4 collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleAdmin">Admin</a>
-                    <div id="mobileNavbarToggleAdmin" purpose="mobile-dropdown" class="collapse" data-parent="#mobileDropdowns">
-                      <a purpose="mobile-dropdown-link" href="/query-generator">Generate queries</a>
-                      <a purpose="mobile-dropdown-link" href="/admin/generate-license">License generator</a>
-                      <a purpose="mobile-dropdown-link" href="/admin/email-preview">HTML Email preview tool</a>
-                    </div>
-                  <%}%>
                   <%if(!hideGetStartedButton){%>
                   <div purpose="mobile-nav-cta" class="d-flex flex-row align-items-center">