diff --git a/bootstrap.info b/bootstrap.info
index 0e2960e..3f0d94b 100644
--- a/bootstrap.info
+++ b/bootstrap.info
@@ -2,7 +2,7 @@ name = Bootstrap
 description = Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.
 version = 2.0
 core = 7.x
-
+regions[navigation]     = 'navigation'
 regions[header]         = 'Top Bar'
 regions[highlighted]    = 'Highlighted'
 regions[help]           = 'Help'
diff --git a/template.php b/template.php
index 8113e01..886e00d 100755
--- a/template.php
+++ b/template.php
@@ -121,57 +121,7 @@ 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']);
 }
@@ -279,26 +229,6 @@ function bootstrap_process_block(&$variables, $hook) {
   $variables['title'] = $variables['block']->subject;
 }
 
-function _bootstrap_search_form($form, &$form_state) {
-  // Get custom search form for now
-  $form = search_form($form, $form_state);
-
-  // Cleanup
-  $form['#attributes']['class'][] = 'navbar-search';
-  $form['#attributes']['class'][] = 'pull-left';
-  $form['basic']['keys']['#title'] = '';
-  $form['basic']['keys']['#attributes']['class'][] = 'search-query';
-  $form['basic']['keys']['#attributes']['class'][] = 'span2';
-  $form['basic']['keys']['#attributes']['placeholder'] = t('Search');
-  unset($form['basic']['submit']);
-  unset($form['basic']['#type']);
-  unset($form['basic']['#attributes']);
-  $form += $form['basic'];
-  unset($form['basic']);
-
-  return $form;
-}
-
 /**
  * Returns the correct span class for a region
  */
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 3a30cc6..10b01f4 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -20,21 +20,14 @@
         </h1>
       <?php endif; ?>
 
-      <div class="nav-collapse">
-        <nav role="navigation">
-          <?php if ($primary_nav): ?>
-            <?php print $primary_nav; ?>
-          <?php endif; ?>
-
-          <?php if ($search): ?>
-            <?php if ($search): print render($search); endif; ?>
-          <?php endif; ?>
+      <?php if ($page['navigation']): ?>
+        <div class="nav-collapse">
+          <nav role="navigation">
+            <?php print render($page['navigation']); ?>
+          </nav>
+        </div>
+      <?php endif; ?>
 
-          <?php if ($secondary_nav): ?>
-            <?php print $secondary_nav; ?>
-          <?php endif; ?>
-        </nav>
-      </div>
     </div>
   </div>
 </header>
diff --git a/theme-settings.php b/theme-settings.php
index 6a349e6..f8ba07b 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -8,12 +8,6 @@ function bootstrap_form_system_theme_settings_alter(&$form, $form_state, $form_i
     return;
   }
 
-  $form['theme_settings']['toggle_search'] = array(
-    '#type' => 'checkbox', 
-    '#title' => t('Search box'), 
-    '#default_value' => theme_get_setting('toggle_search'), 
-  );
- 
   $form['themedev'] = array(
     '#type'          => 'fieldset',
     '#title'         => t('Theme development settings'),