diff --git a/app/assets/stylesheets/thredded-overrides.scss b/app/assets/stylesheets/thredded-overrides.scss
index 2213a875..d49e36f6 100644
--- a/app/assets/stylesheets/thredded-overrides.scss
+++ b/app/assets/stylesheets/thredded-overrides.scss
@@ -1,13 +1,17 @@
 @import "thredded";
 
 #thredded--container {
-  #q /* search input */ {
-    padding-left: 16px;
-  }
+  .thredded--navigation--search {
+    margin-top: 4.5em;
 
-  @media only screen and (min-width: 600px) {
     #q /* search input */ {
-      height: 19px;
+      padding-left: 16px;
+    }
+
+    @media only screen and (min-width: 600px) {
+      #q /* search input */ {
+        height: 19px;
+      }
     }
   }
 
@@ -15,18 +19,33 @@
     margin-top: 0.4em;
     padding-left: 0.1em;
     overflow: hidden;
-    min-height: 5em;
+    min-height: 3em;
     max-height: 60px;
 
+    width: 50%;
+
+    li {
+      display: inline !important;
+      float: left;
+      padding-right: 4px;
+      margin-right: 8px;
+    }
+
     li a {
       padding: 0;
       line-height: 2rem;
     }
   }
 
+  .thredded--scoped-navigation {
+    left: 1rem;
+    top: 1rem;
+  }
+
   .thredded--scoped-navigation li a {
     padding: 0;
     line-height: 2rem;
+    float: left;
   }
 
   .thredded--user-navigation {
@@ -34,6 +53,13 @@
     margin: 1rem;
     border-bottom: 0;
 
+    @media only screen and (max-width: 600px) {
+      .thredded--user-navigation--item {
+        padding-top: 0.5rem;
+        padding-right: 0.5rem;
+      }
+    }
+
     .thredded--user-navigation--item a {
       padding: 8px 4px;
       line-height: 2rem;
diff --git a/app/views/thredded/shared/_nav.html.erb b/app/views/thredded/shared/_nav.html.erb
new file mode 100644
index 00000000..a660fbb3
--- /dev/null
+++ b/app/views/thredded/shared/_nav.html.erb
@@ -0,0 +1,26 @@
+<%= yield :thredded_breadcrumbs %>
+
+<nav class="thredded--navigation">
+  <ul class="thredded--user-navigation<%= ' thredded--user-navigation-standalone' if Thredded.standalone_layout? %>">
+    <%= render 'thredded/shared/nav/moderation' %>
+    <%= render 'thredded/shared/nav/notification_preferences', messageboard: messageboard_or_nil %>
+    <%= render 'thredded/shared/nav/private_topics' if Thredded.private_messaging_enabled %>
+    <% if Thredded.standalone_layout? %>
+      <%= render 'thredded/shared/nav/standalone_profile' if thredded_signed_in? %>
+      <%= render 'thredded/shared/nav/standalone' %>
+    <% end %>
+  </ul>
+  <% if content_for? :thredded_main_navigation %>
+    <%= yield :thredded_main_navigation %>
+  <% else %>
+    <div class="thredded--main-navigation">
+      <%# Navigation scoped to the current messageboard if any. %>
+      <%# yield :thredded_breadcrumbs %>
+      <%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
+      <div class="thredded--spacer"></div>
+      <ul class="thredded--scoped-navigation">
+        <%= render 'thredded/shared/nav/unread_topics', messageboard: messageboard_or_nil %>
+      </ul>
+    </div>
+  <% end %>
+</nav>
\ No newline at end of file
diff --git a/app/views/thredded/users/_badge.html.erb b/app/views/thredded/users/_badge.html.erb
index ad3530da..5abdd866 100644
--- a/app/views/thredded/users/_badge.html.erb
+++ b/app/views/thredded/users/_badge.html.erb
@@ -15,7 +15,7 @@
 
 <% if user.respond_to?(:selected_billing_plan_id) %>
   <% if user.id == 5 %>
-    <span style="<%= badge_style %>; background: #2196F3; color: white"><%= badge_text.presence + 'Admin' %></span>
+    <span style="<%= badge_style %>; background: #2196F3; color: white"><%= badge_text.presence || 'Admin' %></span>
   <% elsif user.selected_billing_plan_id == 2 %>
     <span style="<%= badge_style %>; background: #dedeff"><%= badge_text.presence || 'Beta Tester' %></span>
   <% elsif user.selected_billing_plan_id == 3 %>