diff --git a/assets/scss/modules/_navigation.scss b/assets/scss/modules/_navigation.scss
index eea456626..dd8d02dc3 100755
--- a/assets/scss/modules/_navigation.scss
+++ b/assets/scss/modules/_navigation.scss
@@ -1,14 +1,15 @@
 /* Navigation breakpoints */
 
-.main-navigation {
+.desktop-menu, .top-bar-left {
   @include show-for(medium);
 }
 
-.title-bar {
+#mobile-menu, .title-bar {
   @include hide-for(medium);
 }
 
 /* Mobile menu */
+
 .off-canvas {
   ul#menu-main-menu {
     height: 100vh;
@@ -39,6 +40,7 @@
     padding-bottom: 0;
     font-weight: bold;
     font-size: 0.8rem;
+    line-height: 1;
 
     &:hover:not(.button) {
       background-color: #2a2a2a;
diff --git a/header.php b/header.php
index f6d58aced..0e5d9cb20 100755
--- a/header.php
+++ b/header.php
@@ -35,7 +35,7 @@
 
 	<header id="masthead" class="site-header" role="banner">
 		<div class="title-bar" data-responsive-toggle="site-navigation">
-			<button class="menu-icon" type="button" data-toggle="offCanvas"></button>
+			<button class="menu-icon" type="button" data-toggle="mobile-menu"></button>
 			<div class="title-bar-title">
 				<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
 			</div>
diff --git a/library/navigation.php b/library/navigation.php
index 0e7e37721..2c9e83ba7 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" data-dropdown-menu>%3$s</ul>',
+			'items_wrap'     => '<ul id="%1$s" class="%2$s desktop-menu" data-dropdown-menu>%3$s</ul>',
 			'theme_location' => 'top-bar-r',
 			'depth'          => 3,
 			'fallback_cb'    => false,
diff --git a/parts/mobile-off-canvas.php b/parts/mobile-off-canvas.php
index 6bff3275d..1241d0d52 100755
--- a/parts/mobile-off-canvas.php
+++ b/parts/mobile-off-canvas.php
@@ -9,7 +9,7 @@
 
 ?>
 
-<nav class="off-canvas position-left" id="offCanvas" data-off-canvas data-position="left" role="navigation">
+<nav class="off-canvas position-left" id="mobile-menu" data-off-canvas data-position="left" role="navigation">
   <?php foundationpress_mobile_nav(); ?>
 </nav>
 
diff --git a/parts/mobile-top-bar.php b/parts/mobile-top-bar.php
index 9a43e169d..3093e99fb 100644
--- a/parts/mobile-top-bar.php
+++ b/parts/mobile-top-bar.php
@@ -9,6 +9,6 @@
 
 ?>
 
-<nav class="vertical menu" role="navigation">
+<nav class="vertical menu" id="mobile-menu" role="navigation">
   <?php foundationpress_mobile_nav(); ?>
 </nav>