diff --git a/client/views/nav/admin_menu.html b/client/views/nav/admin_menu.html
index 2fd7e2b9e..0ba018772 100644
--- a/client/views/nav/admin_menu.html
+++ b/client/views/nav/admin_menu.html
@@ -1,6 +1,6 @@
 <template name="adminMenu">
   {{#if isAdmin}}
-    <div class="dropdown">
+    <div class="dropdown header-submodule admin-menu">
       <a class="admin dropdown-top-level" href="/">{{i18n "Admin"}}</a>
       <div class="dropdown-menu">
         <ul role="menu" aria-labelledby="dLabel">
diff --git a/client/views/nav/nav.html b/client/views/nav/nav.html
index 148c3e3d3..16201dbbb 100644
--- a/client/views/nav/nav.html
+++ b/client/views/nav/nav.html
@@ -18,7 +18,7 @@
     {{#if hasPrimaryNav}}
       <ul class="nav primary-nav desktop-nav {{dropdownClass}} header-module desktop-only">
         {{#each primaryNav}}
-          <li class="header-submodule">
+          <li>
             {{> UI.dynamic template=getTemplate}}
           </li>
         {{/each}}
@@ -28,7 +28,7 @@
     {{#if hasSecondaryNav}}
       <ul class="nav secondary-nav desktop-nav {{dropdownClass}} header-module desktop-only">
         {{#each secondaryNav}}
-          <li class="header-submodule">
+          <li>
             {{> UI.dynamic template=getTemplate}}
           </li>
         {{/each}}
diff --git a/client/views/nav/notifications_menu.html b/client/views/nav/notifications_menu.html
index 786f5c69c..43e62bcbb 100644
--- a/client/views/nav/notifications_menu.html
+++ b/client/views/nav/notifications_menu.html
@@ -1,6 +1,6 @@
 <template name="notificationsMenu">
   {{#if isLoggedIn}}
-    <div class="dropdown notifications-menu">
+    <div class="dropdown notifications-menu header-submodule">
       <a class="view  dropdown-top-level" href="/">{{notification_count}}</a>
       <div class="dropdown-menu">
         <ul role="menu" aria-labelledby="dLabel">
diff --git a/client/views/nav/submit_button.html b/client/views/nav/submit_button.html
index e04dbc0f2..a93d5ec5f 100644
--- a/client/views/nav/submit_button.html
+++ b/client/views/nav/submit_button.html
@@ -1,5 +1,5 @@
 <template name="submitButton">
   {{#if canPost}}
-    <a id="submit" class="submit button" href="/submit">{{i18n "Post"}}</a>
+    <a id="submit" class="submit button header-submodule" href="/submit">{{i18n "Post"}}</a>
   {{/if}}
 </template>
\ No newline at end of file
diff --git a/client/views/nav/user_menu.html b/client/views/nav/user_menu.html
index c4dce11d9..7e1577333 100644
--- a/client/views/nav/user_menu.html
+++ b/client/views/nav/user_menu.html
@@ -1,6 +1,6 @@
 <template name="userMenu">
   {{#if isLoggedIn}}
-    <div class="user-menu dropdown">
+    <div class="user-menu dropdown header-submodule">
       <a class="view dropdown-top-level" href="/">{{name}}</a>
       <div class="dropdown-menu">
         <ul role="menu" aria-labelledby="dLabel">
diff --git a/client/views/nav/views_menu.html b/client/views/nav/views_menu.html
index 9a46eb3ed..13665ba7b 100644
--- a/client/views/nav/views_menu.html
+++ b/client/views/nav/views_menu.html
@@ -1,7 +1,7 @@
 <template name="viewsMenu">
   {{#if canView}}
-    <div class="dropdown">
-      <a class="view  dropdown-top-level" href="/">{{i18n "View"}}</a>
+    <div class="dropdown header-submodule views-menu">
+      <a class="view dropdown-top-level" href="/">{{i18n "View"}}</a>
       <div class="dropdown-menu">
         <ul role="menu" aria-labelledby="dLabel">
           {{#each views}}
diff --git a/packages/telescope-search/lib/client/views/search.html b/packages/telescope-search/lib/client/views/search.html
index 198db5a90..b427380bb 100644
--- a/packages/telescope-search/lib/client/views/search.html
+++ b/packages/telescope-search/lib/client/views/search.html
@@ -1,5 +1,5 @@
 <template name="search">
-  <div class="search {{searchQueryEmpty}}">
+  <div class="search {{searchQueryEmpty}} header-submodule">
     <input id="search" type="search" class="search-field" placeholder="search" value="{{searchQuery}}">
   </div>
 </template>
\ No newline at end of file
diff --git a/packages/telescope-tags/lib/client/views/categories_menu.html b/packages/telescope-tags/lib/client/views/categories_menu.html
index c1c53ce04..305502938 100644
--- a/packages/telescope-tags/lib/client/views/categories_menu.html
+++ b/packages/telescope-tags/lib/client/views/categories_menu.html
@@ -1,6 +1,6 @@
 <template name="categoriesMenu">
   {{#if hasCategories}}
-    <div class="dropdown">
+    <div class="dropdown categories-menu header-submodule">
       <a class="categories dropdown-top-level" href="/">{{i18n "Categories"}}</a>
       <div class="dropdown-menu">
         <ul role="menu" aria-labelledby="dLabel">
diff --git a/packages/telescope-theme-base/lib/client/css/screen.css b/packages/telescope-theme-base/lib/client/css/screen.css
index d0d2fb70f..78c537978 100644
--- a/packages/telescope-theme-base/lib/client/css/screen.css
+++ b/packages/telescope-theme-base/lib/client/css/screen.css
@@ -587,26 +587,30 @@ li {
   .header .nav {
     list-style-type: none; }
     /* line 17, ../scss/specific/_header.scss */
-    .header .nav li {
-      margin-bottom: 0; }
+    .header .nav > li {
+      margin-bottom: 0;
+      display: inline-block; }
+      /* line 20, ../scss/specific/_header.scss */
+      .header .nav > li:last-child .header-submodule {
+        margin-right: 0px; }
 
-/* line 22, ../scss/specific/_header.scss */
+/* line 26, ../scss/specific/_header.scss */
 .header-module, .header-submodule {
-  display: inline-block;
   margin-right: 20px; }
-  /* line 25, ../scss/specific/_header.scss */
-  .header-module:last-child, .header-submodule:last-child {
-    margin-right: 0px; }
 
 /* line 29, ../scss/specific/_header.scss */
+.header-module:last-child {
+  margin-right: 0px; }
+
+/* line 32, ../scss/specific/_header.scss */
 .logo {
   vertical-align: middle;
   line-height: 1; }
   @media screen and (max-width: 40em) {
-    /* line 29, ../scss/specific/_header.scss */
+    /* line 32, ../scss/specific/_header.scss */
     .logo {
       margin-right: 0; }
-      /* line 34, ../scss/specific/_header.scss */
+      /* line 37, ../scss/specific/_header.scss */
       .logo a {
         font-size: 24px;
         display: block;
@@ -620,13 +624,13 @@ li {
         z-index: 10;
         margin-right: 0; } }
 
-/* line 50, ../scss/specific/_header.scss */
+/* line 53, ../scss/specific/_header.scss */
 .logo-image a, .logo-image img {
   display: block;
   height: 100%;
   width: 100%; }
 
-/* line 57, ../scss/specific/_header.scss */
+/* line 60, ../scss/specific/_header.scss */
 .mobile-menu-button {
   position: absolute;
   display: inline-block;
@@ -634,7 +638,7 @@ li {
   top: 50%;
   margin-top: -17px;
   z-index: 100; }
-  /* line 63, ../scss/specific/_header.scss */
+  /* line 66, ../scss/specific/_header.scss */
   .mobile-menu-button .hamburger {
     fill: white; }
 
diff --git a/packages/telescope-theme-base/lib/client/scss/specific/_header.scss b/packages/telescope-theme-base/lib/client/scss/specific/_header.scss
index 8e5942652..d6861dc32 100644
--- a/packages/telescope-theme-base/lib/client/scss/specific/_header.scss
+++ b/packages/telescope-theme-base/lib/client/scss/specific/_header.scss
@@ -14,17 +14,20 @@ $mobile-header-height: 50px;
   }
   .nav{
     list-style-type: none;
-    li{
+    >li{
       margin-bottom: 0;
+      display: inline-block;
+      &:last-child .header-submodule{
+        margin-right: 0px;
+      }
     }
   }
 }
 .header-module, .header-submodule{
-  display: inline-block;
   margin-right: 20px;
-  &:last-child{
-    margin-right: 0px;
-  }
+}
+.header-module:last-child{
+  margin-right: 0px;
 }
 .logo{
   vertical-align: middle;