diff --git a/templates/footer.php b/templates/footer.php
index f6392a1..3de48d6 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -1,8 +1,10 @@
-<footer class="content-info" role="contentinfo">
-  <div class="container">
-    <?php dynamic_sidebar('sidebar-footer'); ?>
-    <p>&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?></p>
+<footer class="content-info container" role="contentinfo">
+  <div class="row">
+    <div class="col-lg-12">
+      <?php dynamic_sidebar('sidebar-footer'); ?>
+      <p>&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?></p>
+    </div>
   </div>
 </footer>
 
-<?php wp_footer(); ?>
+<?php wp_footer(); ?>
\ No newline at end of file
diff --git a/templates/header-top-navbar.php b/templates/header-top-navbar.php
index 3d5494d..455bef4 100644
--- a/templates/header-top-navbar.php
+++ b/templates/header-top-navbar.php
@@ -1,18 +1,18 @@
 <header class="banner navbar navbar-static-top" role="banner">
   <div class="navbar-inner">
     <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+      <button data-target=".nav-main" data-toggle="collapse" type="button" class="navbar-toggle">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-      </a>
-      <a class="brand" href="<?php echo home_url(); ?>/">
+      </button>
+      <a class="navbar-brand" href="<?php echo home_url(); ?>/">
         <?php bloginfo('name'); ?>
       </a>
       <nav class="nav-main nav-collapse collapse" role="navigation">
         <?php
           if (has_nav_menu('primary_navigation')) :
-            wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav'));
+            wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav navbar-nav'));
           endif;
         ?>
       </nav>
diff --git a/templates/header.php b/templates/header.php
index fbc5359..0d41a6b 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -1,12 +1,14 @@
-<header class="banner" role="banner">
-  <div class="container">
-    <a class="brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
-    <nav class="nav-main" role="navigation">
-      <?php
-        if (has_nav_menu('primary_navigation')) :
-          wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav nav-pills'));
-        endif;
-      ?>
-    </nav>
+<header class="banner container" role="banner">
+  <div class="row">
+    <div class="col-lg-12">
+      <a class="brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
+      <nav class="nav-main" role="navigation">
+        <?php
+          if (has_nav_menu('primary_navigation')) :
+            wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav nav-pills'));
+          endif;
+        ?>
+      </nav>
+    </div>
   </div>
 </header>
\ No newline at end of file
diff --git a/templates/searchform.php b/templates/searchform.php
index d07224a..6a0368e 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,5 +1,9 @@
-<form role="search" method="get" id="searchform" class="form-search" action="<?php echo home_url('/'); ?>">
-  <label class="hide" for="s"><?php _e('Search for:', 'roots'); ?></label>
-  <input type="text" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" id="s" class="search-query" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
-  <input type="submit" id="searchsubmit" value="<?php _e('Search', 'roots'); ?>" class="btn">
+<form role="search" method="get" id="searchform" class="form-inline" action="<?php echo home_url('/'); ?>">
+  <div class="input-group">
+    <input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" id="s" class="form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+    <label class="hide" for="s"><?php _e('Search for:', 'roots'); ?></label>
+    <span class="input-group-btn">
+      <button type="submit" id="searchsubmit" class="btn"><?php _e('Search', 'roots'); ?></button>
+    </span>
+  </div>
 </form>
\ No newline at end of file