diff --git a/html/includes/device-summary-horiz.inc.php b/html/includes/device-summary-horiz.inc.php
index c95992bd6..ae5d576c0 100644
--- a/html/includes/device-summary-horiz.inc.php
+++ b/html/includes/device-summary-horiz.inc.php
@@ -1,7 +1,7 @@
 <?php
 include_once("includes/object-cache.inc.php");
 ?>
-<div class="panel panel-default panel-condensed">
+<div class="panel panel-default panel-condensed table-responsive">
 <table class="table table-hover table-condensed table-striped">
   <thead>
     <tr class="info">
diff --git a/html/includes/device-summary-vert.inc.php b/html/includes/device-summary-vert.inc.php
index 7a2086bf6..8e0a1ff32 100644
--- a/html/includes/device-summary-vert.inc.php
+++ b/html/includes/device-summary-vert.inc.php
@@ -1,7 +1,7 @@
 <?php
 include_once("includes/object-cache.inc.php");
 ?>
-<div class="panel panel-default panel-condensed">
+<div class="panel panel-default panel-condensed table-responsive">
 <table class="table table-hover table-condensed table-striped">
   <thead>
     <tr class="info">
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 45b1aec84..e0c25d212 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -480,15 +480,13 @@ function print_port_thumbnail($args)
 function print_optionbar_start ($height = 0, $width = 0, $marginbottom = 5)
 {
   echo('
-        <div class="panel panel-default">
-          <div class="panel-heading">
+        <div class="well">
 ');
 }
 
 function print_optionbar_end()
 {
   echo('  </div>');
-  echo('  </div>');
 }
 
 function geteventicon($message)
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 0eea285a3..f3a670060 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -12,9 +12,15 @@ if (isset($config['enable_bgp']) && $config['enable_bgp'])
 
 ?>
 
-<nav class="navbar-wrapper navbar navbar-default navbar-fixed-top" role="navigation">
-  <div id="container">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container-fluid">
     <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navHeaderCollapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
 <?php
 
   if ($config['title_image'])
@@ -29,7 +35,7 @@ if (isset($config['enable_bgp']) && $config['enable_bgp'])
 ?>
     </div>
 
-    <div class="collapse navbar-collapse">
+    <div class="collapse navbar-collapse" id="navHeaderCollapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
           <a href="<?php echo(generate_url(array('page'=>'overview'))); ?>" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><img src="images/16/lightbulb.png" border="0" align="absmiddle" /> Overview<b class="caret"></b></a>
@@ -542,7 +548,6 @@ if ($_SESSION['authenticated'])
 
    </div>
  </div>
-</div>
 </nav>
 <script>
   $('#gsearch').typeahead([
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index f16e59c84..cb7b15cca 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -274,6 +274,7 @@ if($format == "graph")
 } else {
 
   echo('<div class="panel panel-default panel-condensed">
+          <div class="table-responsive">
           <table class="table table-condensed">');
                 
   if ($subformat == "detail" || $subformat == "basic")
@@ -307,6 +308,7 @@ if($format == "graph")
   }
   echo("</table>");
   echo('</div>');
+  echo('</div>');
 }
 
 ?>
diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index 5cb434407..50a4bda2e 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -11,7 +11,9 @@ echo("<div class=\"front-box $frontbox_class\">
 
 echo('
   <div class="row">
-    <div class="col-md-9">
+    <div class="col-md-8">
+      <div class="row">
+        <div class="col-md-12">
 ');
 
 echo('<div class=front-page>');
@@ -121,7 +123,9 @@ echo('</div>');
 echo('</div>');
 echo('</div>');
 echo('
-  <div class="col-md-3">
+  </div>
+  </div>
+  <div class="col-md-4">
 ');
 
 if ($config['vertical_summary'])
@@ -151,8 +155,8 @@ if ($config['enable_syslog'])
             <div class="col-md-12">
               &nbsp;
             </div>
-          </row>
-          <row>
+          </div>
+          <div class="row">
             <div class="col-md-12">
               <div class="panel panel-default panel-condensed">
               <div class="panel-heading">
@@ -189,8 +193,8 @@ if ($config['enable_syslog'])
             <div class="col-md-12">
               &nbsp;
             </div>
-          </row>
-          <row>
+          </div>
+          <div class="row">
             <div class="col-md-12">
               <div class="panel panel-default panel-condensed">
               <div class="panel-heading">
@@ -213,7 +217,6 @@ if ($config['enable_syslog'])
 echo("</div>");
 
 echo('
-  </div>
 </div>
 ');