diff --git a/assets/scss/components/_off-canvas.scss b/assets/scss/components/_off-canvas.scss
deleted file mode 100644
index 72361828e..000000000
--- a/assets/scss/components/_off-canvas.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.off-canvas {
-  ul#menu-main-menu {
-    height: 100vh;
-    padding: 1rem;
-  }
-}
-
-.title-bar-title {
-  a {
-    font-size: 1rem;
-    color: #B9B9B9;
-  }
-}
diff --git a/assets/scss/foundation.scss b/assets/scss/foundation.scss
index d0edf4c38..cd3a18df9 100755
--- a/assets/scss/foundation.scss
+++ b/assets/scss/foundation.scss
@@ -21,7 +21,7 @@
 @import 'font-awesome';
 @import 'motion-ui';
 
-// Foundation global styles 
+// Foundation global styles
 @include foundation-global-styles;
 
 // Individual foundation components
@@ -70,7 +70,7 @@
 */
 
 // Modules
-@import "modules/topbar";
+@import "modules/navigation";
 @import "modules/footer";
 @import "modules/sidebar";
 
@@ -78,7 +78,6 @@
 @import "components/buttons";
 @import "components/featured-image";
 @import "components/dividers";
-@import "components/off-canvas";
 
 // Templates
 @import "templates/front";
diff --git a/assets/scss/modules/_topbar.scss b/assets/scss/modules/_navigation.scss
similarity index 52%
rename from assets/scss/modules/_topbar.scss
rename to assets/scss/modules/_navigation.scss
index 587f59ef4..4b2e76d96 100755
--- a/assets/scss/modules/_topbar.scss
+++ b/assets/scss/modules/_navigation.scss
@@ -1,3 +1,29 @@
+/* Navigation breakpoints */
+
+.main-navigation {
+  @include show-for(medium);
+}
+
+.title-bar {
+  @include hide-for(medium);
+}
+
+/* Mobile menu */
+.off-canvas {
+  ul#menu-main-menu {
+    height: 100vh;
+    padding: 1rem;
+  }
+}
+
+.title-bar-title {
+  a {
+    font-size: 1rem;
+    color: #B9B9B9;
+  }
+}
+
+/* Tablet and desktop menu */
 .top-bar {
 
   .menu .home a {
@@ -19,15 +45,8 @@
     }
   }
 
-  .menu>li:not(.menu-text)>a {
-    padding: 1rem;
-  }
-
-  .menu li:not(:last-child) {
-    @include breakpoint(medium) {
-      border-right: 1px solid #4e4e4e;
-    }
-  }
+  .menu>li:not(.menu-text)>a { padding: 1rem; }
+  .menu li:not(:last-child) { border-right: 1px solid #4e4e4e; }
 
   .dropdown.menu .submenu {
     background-color: #121212;
@@ -35,28 +54,10 @@
     border: 0;
   }
 
-  .dropdown.menu .has-submenu.is-down-arrow a {
-    padding-right: 1rem;
-  }
-
-  .dropdown.menu .has-submenu.is-down-arrow>a::after {
-    border: 0;
-  }
-
-
+  .dropdown.menu .has-submenu.is-down-arrow a { padding-right: 1rem; }
+  .dropdown.menu .has-submenu.is-down-arrow>a::after { border: 0; }
 }
 
 .vertical &.menu {
   padding: 1rem;
 }
-
-.title-bar {
-  @include breakpoint(medium) {
-    display: none;
-  }
-
-  .title a {
-    font-size: 1rem;
-    color: #B9B9B9;
-  }
-}
diff --git a/header.php b/header.php
index e3c71d604..f6d58aced 100755
--- a/header.php
+++ b/header.php
@@ -42,7 +42,7 @@
 		</div>
 
 		<nav id="site-navigation" class="main-navigation top-bar" role="navigation">
-			<div class="top-bar-left show-for-medium">
+			<div class="top-bar-left">
 				<ul class="menu">
 					<li class="home"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></li>
 				</ul>
diff --git a/library/navigation.php b/library/navigation.php
index 595c9800c..0e7e37721 100755
--- a/library/navigation.php
+++ b/library/navigation.php
@@ -24,7 +24,7 @@ function foundationpress_top_bar_r() {
 		wp_nav_menu( array(
 			'container'      => false,
 			'menu_class'     => 'dropdown menu',
-			'items_wrap'     => '<ul id="%1$s" class="%2$s show-for-medium" data-dropdown-menu>%3$s</ul>',
+			'items_wrap'     => '<ul id="%1$s" class="%2$s" data-dropdown-menu>%3$s</ul>',
 			'theme_location' => 'top-bar-r',
 			'depth'          => 3,
 			'fallback_cb'    => false,
@@ -44,7 +44,7 @@ function foundationpress_mobile_nav() {
 			'menu'           => __( 'mobile-nav', 'foundationpress' ),
 			'menu_class'     => 'vertical menu',
 			'theme_location' => 'mobile-nav',
-			'items_wrap'     => '<ul id="%1$s" class="%2$s show-for-small-only" data-accordion-menu>%3$s</ul>',
+			'items_wrap'     => '<ul id="%1$s" class="%2$s" data-accordion-menu>%3$s</ul>',
 			'fallback_cb'    => false,
 			'walker'         => new Foundationpress_Mobile_Walker(),
 		));