diff --git a/inc/nav-drop-multi.php b/inc/nav-drop-multi.php
index dcf32f7..ccc20c0 100644
--- a/inc/nav-drop-multi.php
+++ b/inc/nav-drop-multi.php
@@ -43,36 +43,39 @@
 }
 </style>
 
-
-<nav class="navbar navbar-default" role="navigation">
-	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
-		</div>
-	<div class="collapse navbar-collapse" id="navbar-collapse-1">
-    <?php
-			$locations = get_nav_menu_locations();
-			$menu_at_primary_location = $locations['primary'];
-			$items = wp_get_nav_menu_items( $menu_at_primary_location );
-			if(empty($items)){
-				echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
-			} else {
-				$menu = wp_nav_menu( 
-					array(
-						'menu_class' => 'nav navbar-nav',
-						'theme_location' => 'primary', /* where in the theme it's assigned */
-						'container' => false, /* container class */
-						'fallback_cb' => 'hale_main_nav_fallback',
-						'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-						'walker' => new Drop_Multi_Nav_Walker()/*,
-						'with_search' => true*/
-					)
-				);			
-			}
-		?>
-    </div>
-	
-	
-</nav>
+<div id="nav-drop-multi">
+	<div id="drop-multi-wrapper">
+		<nav id="drop-multi" class="container">
+			<nav class="navbar navbar-default" role="navigation">
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
+				</div>
+				<div class="collapse navbar-collapse" id="navbar-collapse-1">
+				<?php
+						$locations = get_nav_menu_locations();
+						$menu_at_primary_location = $locations['primary'];
+						$items = wp_get_nav_menu_items( $menu_at_primary_location );
+						if(empty($items)){
+							echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
+						} else {
+							$menu = wp_nav_menu( 
+								array(
+									'menu_class' => 'nav navbar-nav',
+									'theme_location' => 'primary', /* where in the theme it's assigned */
+									'container' => false, /* container class */
+									'fallback_cb' => 'hale_main_nav_fallback',
+									'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+									'walker' => new Drop_Multi_Nav_Walker()/*,
+									'with_search' => true*/
+								)
+							);			
+						}
+					?>
+				</div>
+			</nav>
+		</nav>
+	</div>
+</div>
 
 
 <!-- JavaScript jQuery code from Bootply.com editor  --> 
diff --git a/inc/nav-tabs.php b/inc/nav-tabs.php
index 464fdd1..d9f2d04 100644
--- a/inc/nav-tabs.php
+++ b/inc/nav-tabs.php
@@ -1,174 +1,175 @@
-<!-- CSS code from Bootply.com editor -->
-<style type="text/css">
-.marginBottom-0 {
-	margin-bottom: 0;
-}
-.dropdown-submenu {
-	position: relative;
-}
-.dropdown-submenu>.dropdown-menu {
-	top: 0;
-	left: 100%;
-	margin-top: -6px;
-	margin-left: -1px;
-	-webkit-border-radius: 0 6px 6px 6px;
-	-moz-border-radius: 0 6px 6px 6px;
-	border-radius: 0 6px 6px 6px;
-}
-.dropdown-submenu>a:after {
-	display: block;
-	content: " ";
-	float: right;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 5px 0 5px 5px;
-	border-left-color: #cccccc;
-	margin-top: 5px;
-	margin-right: -10px;
-}
-.dropdown-submenu:hover>a:after {
-	border-left-color: #555;
-}
-.dropdown-submenu.pull-left {
-	float: none;
-}
-.dropdown-submenu.pull-left>.dropdown-menu {
-	left: -100%;
-	margin-left: 10px;
-	-webkit-border-radius: 6px 0 6px 6px;
-	-moz-border-radius: 6px 0 6px 6px;
-	border-radius: 6px 0 6px 6px;
-}
-</style>
-<nav class="navbar navbar-default visible-xs-block hidden-sm hidden-md hidden-lg" role="navigation">
-	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
-		<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
-	</div>
-	<div class="collapse navbar-collapse" id="navbar-collapse-1">
-    <?php
-			$locations = get_nav_menu_locations();
-			$menu_at_primary_location = $locations['primary'];
-			$items = wp_get_nav_menu_items( $menu_at_primary_location );
-			if(empty($items)){
-				echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
-			} else {
-				$menu = wp_nav_menu( 
-					array(
-						'menu_class' => 'nav navbar-nav',
-						'theme_location' => 'primary', /* where in the theme it's assigned */
-						'container' => false, /* container class */
-						'fallback_cb' => 'hale_main_nav_fallback',
-						'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-						'walker' => new Drop_Multi_Nav_Walker()/*,
-						'with_search' => true*/
-					)
-				);			
-			}
-		?>
-    </div>
-</nav>
-
-<div id="nav-tabs" class="hidden-xs">
-	<div id="tabs-top-wrapper" class="tabs-wrapper">
-		<nav id="tabs-top" class="container">
-			<?php
-				$locations = get_nav_menu_locations();
-				$menu_at_primary_location = $locations['primary'];
-				$items = wp_get_nav_menu_items( $menu_at_primary_location );
-				if(empty($items)){
-					echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
-				} else {
-					$menu = wp_nav_menu( 
-						array(
-							'menu_class' => 'nav nav-tabs',
-							'theme_location' => 'primary', /* where in the theme it's assigned */
-							'container' => false, /* container class */
-							'fallback_cb' => 'hale_main_nav_fallback',
-							'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-							'walker' => new Top_Tabs_Nav_Walker()/*,
-							'with_search' => true*/
-						)
-					);	
-					?>
-		</nav>
-	</div>
-	<?php
-$menu_name = 'primary';
-$locations = get_nav_menu_locations();
-$menu_id = $locations[ $menu_name ] ;
-$menu_items = wp_get_nav_menu_items( $menu_at_primary_location );
-_wp_menu_item_classes_by_context($menu_items);
-//print_r($menu_items);
-$page = get_the_ID();
-$page_id = 0;
-$tabs = false;
-foreach($menu_items as $item){
-	if($item->object_id == $page){
-		$page_id = $item->ID;
-	}
-	if($item->menu_item_parent != 0 && $item->menu_item_parent == $page_id){
-		$tabs = true;
-		break;
-	}
-}
-foreach($menu_items as $item){
-	if($item->menu_item_parent == 0 && $item->current_item_ancestor){
-		$tabs = true;
-		break;
-	}
-}
-//$tabs = true;
-if($tabs){
-	?>
-	<div id="tabs-bottom-wrapper" class="tabs-wrapper">
-		<div id="tabs-bottom" class="container">
-			<nav class="navbar navbar-default" role="navigation">
-		
-			<?php
-					$menu = wp_nav_menu( 
-						array(
-							'menu_class' => 'nav navbar-nav',
-							'theme_location' => 'primary', /* where in the theme it's assigned */
-							'container' => false, /* container class */
-							'fallback_cb' => 'hale_main_nav_fallback',
-							'items_wrap' =>	'<ul class="%2$s">%3$s</ul>',
-							'walker' => new Tabs_Drop_Nav_Walker()/*,
-							'with_search' => true*/
-						)
-					);			
-				}
-			?>
-			</nav>
-		</div>
-	</div>
-    <?php } ?>
-</div>
-
-<!-- JavaScript jQuery code from Bootply.com editor  --> 
-
-<script type='text/javascript'>
-        
-            (function($){
-
-	$(document).ready(function(){
-
-		$('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) {
-
-			event.preventDefault(); 
-
-			event.stopPropagation(); 
-
-			$(this).parent().siblings().removeClass('open');
-
-			$(this).parent().toggleClass('open');
-
-		});
-
-	});
-
-})(jQuery);
-        
-        </script> 
+<!-- CSS code from Bootply.com editor -->
+<style type="text/css">
+.marginBottom-0 {
+	margin-bottom: 0;
+}
+.dropdown-submenu {
+	position: relative;
+}
+.dropdown-submenu>.dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: -6px;
+	margin-left: -1px;
+	-webkit-border-radius: 0 6px 6px 6px;
+	-moz-border-radius: 0 6px 6px 6px;
+	border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu>a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+.dropdown-submenu:hover>a:after {
+	border-left-color: #555;
+}
+.dropdown-submenu.pull-left {
+	float: none;
+}
+.dropdown-submenu.pull-left>.dropdown-menu {
+	left: -100%;
+	margin-left: 10px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+</style>
+<nav class="navbar navbar-default visible-xs-block hidden-sm hidden-md hidden-lg" role="navigation">
+	<div class="navbar-header">
+		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
+		<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>">
+		<?php bloginfo( 'name' ); ?>
+		</a> 
+	</div>
+	<div class="collapse navbar-collapse" id="navbar-collapse-1">
+		<?php
+				$locations = get_nav_menu_locations();
+				$menu_at_primary_location = $locations['primary'];
+				$items = wp_get_nav_menu_items( $menu_at_primary_location );
+				if(empty($items)){
+					echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
+				} else {
+					$menu = wp_nav_menu( 
+						array(
+							'menu_class' => 'nav navbar-nav',
+							'theme_location' => 'primary', /* where in the theme it's assigned */
+							'container' => false, /* container class */
+							'fallback_cb' => 'hale_main_nav_fallback',
+							'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+							'walker' => new Drop_Multi_Nav_Walker()/*,
+							'with_search' => true*/
+						)
+					);			
+				}
+			?>
+	</div>
+</nav>
+<div id="nav-tabs" class="hidden-xs">
+	<div id="tabs-top-wrapper" class="tabs-wrapper">
+		<nav id="tabs-top" class="container">
+			<?php
+				$locations = get_nav_menu_locations();
+				$menu_at_primary_location = $locations['primary'];
+				$items = wp_get_nav_menu_items( $menu_at_primary_location );
+				if(empty($items)){
+					echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>
+					</nav>
+				</div>';
+				} else {
+					$menu = wp_nav_menu( 
+						array(
+							'menu_class' => 'nav nav-tabs',
+							'theme_location' => 'primary', /* where in the theme it's assigned */
+							'container' => false, /* container class */
+							'fallback_cb' => 'hale_main_nav_fallback',
+							'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+							'walker' => new Top_Tabs_Nav_Walker()/*,
+							'with_search' => true*/
+						)
+					);?>
+					</nav>
+					</div> <!-- /tabs-top-wrapper -->
+					<?php
+					$menu_name = 'primary';
+					$locations = get_nav_menu_locations();
+					$menu_id = $locations[ $menu_name ] ;
+					$menu_items = wp_get_nav_menu_items( $menu_at_primary_location );
+					_wp_menu_item_classes_by_context($menu_items);
+					//print_r($menu_items);
+					$page = get_the_ID();
+					$page_id = 0;
+					$tabs = false;
+					foreach($menu_items as $item){
+						if($item->object_id == $page){
+							$page_id = $item->ID;
+						}
+						if($item->menu_item_parent != 0 && $item->menu_item_parent == $page_id){
+							$tabs = true;
+							break;
+						}
+					}
+					foreach($menu_items as $item){
+						if($item->menu_item_parent == 0 && $item->current_item_ancestor){
+							$tabs = true;
+							break;
+						}
+					}
+					//$tabs = true;
+					if($tabs){
+					?>
+					<div id="tabs-bottom-wrapper" class="tabs-wrapper">
+						<div id="tabs-bottom" class="container">
+							<nav class="navbar navbar-default" role="navigation">
+								<?php
+									$menu = wp_nav_menu( 
+										array(
+											'menu_class' => 'nav navbar-nav',
+											'theme_location' => 'primary', /* where in the theme it's assigned */
+											'container' => false, /* container class */
+											'fallback_cb' => 'hale_main_nav_fallback',
+											'items_wrap' =>	'<ul class="%2$s">%3$s</ul>',
+											'walker' => new Tabs_Drop_Nav_Walker()/*,
+											'with_search' => true*/
+										)
+									);			
+							?>
+							</nav>
+						</div>
+					</div>
+					<?php } 
+					} ?>
+</div>
+
+<!-- JavaScript jQuery code from Bootply.com editor  --> 
+
+<script type='text/javascript'>
+        
+            (function($){
+
+	$(document).ready(function(){
+
+		$('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) {
+
+			event.preventDefault(); 
+
+			event.stopPropagation(); 
+
+			$(this).parent().siblings().removeClass('open');
+
+			$(this).parent().toggleClass('open');
+
+		});
+
+	});
+
+})(jQuery);
+        
+        </script> 
diff --git a/inc/nav.php b/inc/nav.php
index 68d8735..c3e7fda 100644
--- a/inc/nav.php
+++ b/inc/nav.php
@@ -1,44 +1,50 @@
-<nav id="site-navigation" class="navbar navbar-default" role="navigation">
-	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#primary-nav">
-			<span class="sr-only">Toggle navigation</span>
-			<span class="menu-icon">
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-			</span>
-			<span class="menu-label">Menu</span>
-		</button>
-		<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
+<div id="nav-dropdown">
+	<div id="dropdown-wrapper">
+		<nav id="dropdown" class="container">
+			<nav id="site-navigation" class="navbar navbar-default" role="navigation">
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#primary-nav">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="menu-icon">
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+						</span>
+						<span class="menu-label">Menu</span>
+					</button>
+					<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
+				</div>
+				<a class="skip-link screen-reader-text sr-only" href="#content">
+					<?php _e( 'Skip to content', 'cs' ); ?></a>
+				<div class="collapse navbar-collapse" id="primary-nav">
+					<?php
+						$locations = get_nav_menu_locations();
+						$menu_at_primary_location = $locations['primary'];
+						$items = wp_get_nav_menu_items( $menu_at_primary_location );
+						if(empty($items)){
+							echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
+						} else {
+							$menu = wp_nav_menu( 
+								array(
+									'menu_class' => 'nav navbar-nav'.$nav1.' '.$nav2,
+									'theme_location' => 'primary', /* where in the theme it's assigned */
+									'container' => false, /* container class */
+									'fallback_cb' => 'hale_main_nav_fallback',
+									'items_wrap' =>	'<ul id="%1$s" class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+									'walker' => new Bootstrap_Nav_Walker()/*,
+									'with_search' => true*/
+								)
+							);			
+						}
+					?>
+					<div class="visible-xs-block">
+					<div class="navbar-form navbar-right">
+						<?php get_search_form(); ?>
+					</div>
+					</div>
+				</div>
+			</nav>
+		</nav>
 	</div>
-	<a class="skip-link screen-reader-text sr-only" href="#content">
-		<?php _e( 'Skip to content', 'cs' ); ?></a>
-	<div class="collapse navbar-collapse" id="primary-nav">
-		<?php
-			$locations = get_nav_menu_locations();
-			$menu_at_primary_location = $locations['primary'];
-			$items = wp_get_nav_menu_items( $menu_at_primary_location );
-			if(empty($items)){
-				echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
-			} else {
-				$menu = wp_nav_menu( 
-					array(
-						'menu_class' => 'nav navbar-nav'.$nav1.' '.$nav2,
-						'theme_location' => 'primary', /* where in the theme it's assigned */
-						'container' => false, /* container class */
-						'fallback_cb' => 'hale_main_nav_fallback',
-						'items_wrap' =>	'<ul id="%1$s" class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-						'walker' => new Bootstrap_Nav_Walker()/*,
-						'with_search' => true*/
-					)
-				);			
-			}
-		?>
-		<div class="visible-xs-block">
-		<div class="navbar-form navbar-right">
-			<?php get_search_form(); ?>
-		</div>
-		</div>
-	</div>
-</nav>
+</div>
 <!-- #site-navigation -->	
\ No newline at end of file
diff --git a/sass/_nav.scss b/sass/_nav.scss
index 0c4376c..49953be 100644
--- a/sass/_nav.scss
+++ b/sass/_nav.scss
@@ -1,16 +1,35 @@
 /*	NAV
 --------------------------------------------------------------*/		
-#nav-tabs .nav-tabs {
-	border-bottom:0;
-	
-	& > li.active > a, 
-	& > li.active > a:hover, 
-	& > li.active > a:focus {
-		background-color:$navbar-default-bg;
-		border-bottom:1px solid $navbar-default-bg;
-		position:relative;
-		bottom:-1px;
-		z-index:9999;
+
+#nav-tabs {
+	padding-bottom:.5em;
+
+	.nav-tabs {
+		border-bottom:0;
+		
+		& > li > a:hover {
+			border-color: $nav-tabs-border-color;
+			border-radius: $border-radius-base;
+		}
+		
+		& > li.active > a, 
+		& > li.active > a:hover, 
+		& > li.active > a:focus {
+			background-color:$navbar-default-bg;
+			z-index:9999;
+			border-radius: $border-radius-base;
+			border-bottom-color: $nav-tabs-border-color;
+		}
+		
+		& > li.active.menu-item-has-children > a, 
+		& > li.active.menu-item-has-children > a:hover, 
+		& > li.active.menu-item-has-children > a:focus {
+			//border-bottom:1px solid $navbar-default-bg;
+			//position:relative;
+			//bottom:-1px;	
+			border-radius: $border-radius-base $border-radius-base 0 0;
+			border-bottom-color: transparent;
+		}
 	}
 }
 
diff --git a/style.css b/style.css
index 75ab355..4b6ada6 100644
--- a/style.css
+++ b/style.css
@@ -5733,14 +5733,21 @@ button.close {
 
 /*	NAV
 --------------------------------------------------------------*/
-#nav-tabs .nav-tabs {
-  border-bottom: 0; }
-  #nav-tabs .nav-tabs > li.active > a, #nav-tabs .nav-tabs > li.active > a:hover, #nav-tabs .nav-tabs > li.active > a:focus {
-    background-color: #f8f8f8;
-    border-bottom: 1px solid #f8f8f8;
-    position: relative;
-    bottom: -1px;
-    z-index: 9999; }
+#nav-tabs {
+  padding-bottom: .5em; }
+  #nav-tabs .nav-tabs {
+    border-bottom: 0; }
+    #nav-tabs .nav-tabs > li > a:hover {
+      border-color: #ddd;
+      border-radius: 4px; }
+    #nav-tabs .nav-tabs > li.active > a, #nav-tabs .nav-tabs > li.active > a:hover, #nav-tabs .nav-tabs > li.active > a:focus {
+      background-color: #f8f8f8;
+      z-index: 9999;
+      border-radius: 4px;
+      border-bottom-color: #ddd; }
+    #nav-tabs .nav-tabs > li.active.menu-item-has-children > a, #nav-tabs .nav-tabs > li.active.menu-item-has-children > a:hover, #nav-tabs .nav-tabs > li.active.menu-item-has-children > a:focus {
+      border-radius: 4px 4px 0 0;
+      border-bottom-color: transparent; }
 
 #primary-nav a.external {
   max-height: 50px; }