diff --git a/bootstrap.info b/bootstrap.info
index 2243816..7fea96c 100644
--- a/bootstrap.info
+++ b/bootstrap.info
@@ -3,6 +3,7 @@ description = Built to use Bootstrap, a sleek, intuitive, and powerful front-end
 version = 2.0
 core = 7.x
 
+regions[navigation]     = 'Navigation'
 regions[header]         = 'Top Bar'
 regions[highlighted]    = 'Highlighted'
 regions[help]           = 'Help'
diff --git a/includes/modules/menu.inc b/includes/modules/menu.inc
index 474c0f6..0ff873a 100755
--- a/includes/modules/menu.inc
+++ b/includes/modules/menu.inc
@@ -77,8 +77,22 @@ function bootstrap_menu_link(array $variables) {
   if ($element['#below']) {
     // Ad our own wrapper
     unset($element['#below']['#theme_wrappers']);
-    $sub_menu = '<ul>' . drupal_render($element['#below']) . '</ul>';
+    $sub_menu = '<ul class="dropdown-menu">' . drupal_render($element['#below']) . '</ul>';
 
+    $element['#localized_options']['attributes']['class'][] = 'dropdown-toggle';
+    $element['#localized_options']['attributes']['data-toggle'] = 'dropdown';
+
+    // Check if this element is nested within another
+    if ((!empty($element['#original_link']['depth'])) && ($element['#original_link']['depth'] > 1)) {
+      // Generate as dropdown submenu
+      $element['#attributes']['class'][] = 'dropdown-submenu';
+    }
+    else {
+      // Generate as standard dropdown
+      $element['#attributes']['class'][] = 'dropdown';
+      $element['#localized_options']['html'] = TRUE;
+      $element['#title'] .= '<b class="caret"></b>';
+    }
     //$element['#localized_options']['attributes']['class'][] = 'dropdown-toggle';
     //$element['#localized_options']['attributes']['data-toggle'] = 'dropdown';
     $element['#localized_options']['attributes']['data-target'] = '#';
@@ -148,4 +162,4 @@ function _bootstrap_local_tasks($tabs = FALSE) {
   }
   
   return $tabs;
-}
\ No newline at end of file
+}
diff --git a/template.php b/template.php
index 3d1ec53..e3152b5 100755
--- a/template.php
+++ b/template.php
@@ -121,57 +121,12 @@ function bootstrap_preprocess_page(&$variables) {
   else {
     $variables['columns'] = 1;
   }
-  
+
   // Our custom search because its cool :)
   $variables['search'] = FALSE;
   if (theme_get_setting('toggle_search') && module_exists('search')) {
     $variables['search'] = drupal_get_form('_bootstrap_search_form');
   }
-
-  // Primary nav
-  $variables['primary_nav'] = FALSE;
-  if ($variables['main_menu']) {
-    // Build links
-    $tree = menu_tree_page_data(variable_get('menu_main_links_source', 'main-menu'));
-    $variables['main_menu'] = bootstrap_menu_navigation_links($tree);
-    
-    // Build list
-    $variables['primary_nav'] = theme('bootstrap_links', array(
-      'links' => $variables['main_menu'],
-      'attributes' => array(
-        'id' => 'main-menu',
-        'class' => array('nav'),
-      ),
-      'heading' => array(
-        'text' => t('Main menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      ),
-    ));
-  }
-  
-  // Secondary nav
-  $variables['secondary_nav'] = FALSE;
-  if (function_exists('menu_load') && $variables['secondary_menu']) {
-    $secondary_menu = menu_load(variable_get('menu_secondary_links_source', 'user-menu'));
-
-    // Build list
-    $variables['secondary_nav'] = theme('bootstrap_btn_dropdown', array(
-      'links' => $variables['secondary_menu'],
-      'label' => $secondary_menu['title'],
-      'type' => 'success',
-      'attributes' => array(
-        'id' => 'user-menu',
-        'class' => array('pull-right'),
-      ),
-      'heading' => array(
-        'text' => t('Secondary menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      ),
-    ));
-  }
-  
   // Replace tabs with drop down version
   $variables['tabs']['#primary'] = _bootstrap_local_tasks($variables['tabs']['#primary']);
 }
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 3a30cc6..bb72369 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -22,17 +22,12 @@
 
       <div class="nav-collapse">
         <nav role="navigation">
-          <?php if ($primary_nav): ?>
-            <?php print $primary_nav; ?>
+          <?php if ($page['navigation']): ?>
+              <?php print render($page['navigation']); ?>
           <?php endif; ?>
-
           <?php if ($search): ?>
             <?php if ($search): print render($search); endif; ?>
           <?php endif; ?>
-
-          <?php if ($secondary_nav): ?>
-            <?php print $secondary_nav; ?>
-          <?php endif; ?>
         </nav>
       </div>
     </div>