diff --git a/html/includes/topnav.inc.php b/html/includes/topnav.inc.php
index a997844198..b8b3de42de 100644
--- a/html/includes/topnav.inc.php
+++ b/html/includes/topnav.inc.php
@@ -69,12 +69,13 @@ if ($ports['down'])    { $ports['bgcolour'] = "#ffcccc"; } else { $ports['bgcolo
 if ($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['bgcolour'] = "transparent"; }
 
 ?>
-            <div class="container pull-right">
+            <div class="container-fluid">
               <div class="row">
                 <div class="col-md-6">
-<table class="table table-condensed table-striped">
+                  <div class="panel panel-default panel-condensed">
+<table class="table table-hover table-condensed table-striped">
   <thead>
-    <tr>
+    <tr class="info">
       <th>&nbsp;</th>
       <th>Total</th>
       <th>Up</th>
@@ -84,7 +85,7 @@ if ($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['
     </tr>
   </thead>
   <tbody>
-    <tr>
+    <tr class="active">
       <td><a href="devices/">Devices</a></td>
       <td><a href="devices/"><span><?php echo($devices['count']) ?></span></a></td>
       <td><a href="devices/state=up/format=list_detail/"><span class="green"> <?php echo($devices['up']) ?> up</span></a></td>
@@ -92,7 +93,7 @@ if ($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['
       <td><a href="devices/ignore=1/format=list_detail/"><span class="grey"> <?php echo($devices['ignored']) ?> ignored </span></a></td>
       <td><a href="devices/disabled=1/format=list_detail/"><span class="black"> <?php echo($devices['disabled']) ?> disabled</span></a></td>
     </tr>
-    <tr class="danger">
+    <tr class="active">
       <td><a href="ports/">Ports</a></td>
       <td><a href="ports/"><span><?php echo($ports['count']) ?></span></a></td>
       <td><a href="ports/format=list_detail/state=up/"><span class="green"> <?php echo($ports['up']) ?> up </span></a></td>
@@ -101,7 +102,7 @@ if ($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['
       <td><a href="ports/format=list_detail/state=admindown/"><span class="black"> <?php echo($ports['shutdown']) ?> shutdown</span></a></td>
     </tr>
 <?php if ($config['show_services']) { ?>
-    <tr>
+    <tr class="active">
       <td><a href="services/">Services</a></td>
       <td><a href="services/"><span><?php echo($services['count']) ?></span></a></td>
       <td><a href="services/state=up/view=details/"><span class="green"><?php echo($services['up']) ?> up</span></a></td>
@@ -112,6 +113,7 @@ if ($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['
 <?php } ?>
   </tbody>
 </table>
+              </div>
               </div>
               <div class="col-md-6">
                 &nbsp;