diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php
index c3990c544..b8cf1c379 100644
--- a/html/includes/common/availability-map.inc.php
+++ b/html/includes/common/availability-map.inc.php
@@ -9,6 +9,7 @@
 * option) any later version.  Please see LICENSE.txt at the top level of
 * the source code distribution for details.
 */
+require_once 'includes/object-cache.inc.php';
 
 $sql = 'SELECT `D`.`hostname`,`D`.`device_id`,`D`.`status`,`D`.`uptime` FROM `devices` AS `D`';
 
@@ -40,5 +41,5 @@ foreach(dbFetchRows($sql,$param) as $device) {
 $temp_rows = count($temp_output);
 
 $temp_output[] = '</div>';
-$temp_header = array('<div style="margin-left:auto; margin-right:auto;"><center><h3>All Devices(' . $temp_rows . ')</h3></center>');
+$temp_header = array('<div style="margin-left:auto; margin-right:auto;"><center><h5><i class="fa fa-check" style="color:green">'.$devices['up'].' </i> <i class="fa fa-exclamation-triangle" style="color:orange"> 0</i> <i class="fa fa-exclamation-circle" style="color:red"> '.$devices['down'].'</i></h5></center><br>');
 $common_output = array_merge($temp_header,$temp_output);
diff --git a/html/includes/common/device-summary-horiz.inc.php b/html/includes/common/device-summary-horiz.inc.php
index 4d150ef8c..439234af4 100644
--- a/html/includes/common/device-summary-horiz.inc.php
+++ b/html/includes/common/device-summary-horiz.inc.php
@@ -18,18 +18,18 @@ $temp_output = '
     <tr class="active">
       <td><a href="devices/">Devices</a></td>
       <td><a href="devices/"><span>'.$devices['count'].'</span></a></td>
-      <td><a href="devices/state=up/format=list_detail/"><span class="green"> '.$devices['up'].' up</span></a></td>
-      <td><a href="devices/state=down/format=list_detail/"><span class="red"> '.$devices['down'].' down</span></a></td>
-      <td><a href="devices/ignore=1/format=list_detail/"><span class="grey"> '.$devices['ignored'].' ignored </span></a></td>
-      <td><a href="devices/disabled=1/format=list_detail/"><span class="black"> '.$devices['disabled'].' disabled</span></a></td>
+      <td><a href="devices/state=up/format=list_detail/"><span class="green"> '.$devices['up'].'</span></a></td>
+      <td><a href="devices/state=down/format=list_detail/"><span class="red"> '.$devices['down'].'</span></a></td>
+      <td><a href="devices/ignore=1/format=list_detail/"><span class="grey"> '.$devices['ignored'].'</span></a></td>
+      <td><a href="devices/disabled=1/format=list_detail/"><span class="black"> '.$devices['disabled'].'</span></a></td>
     </tr>
     <tr class="active">
       <td><a href="ports/">Ports</a></td>
       <td><a href="ports/"><span>'.$ports['count'].'</span></a></td>
-      <td><a href="ports/format=list_detail/state=up/"><span class="green"> '.$ports['up'].' up </span></a></td>
-      <td><a href="ports/format=list_detail/state=down/"><span class="red"> '.$ports['down'].' down </span></a></td>
-      <td><a href="ports/format=list_detail/ignore=1/"><span class="grey"> '.$ports['ignored'].' ignored </span></a></td>
-      <td><a href="ports/format=list_detail/state=admindown/"><span class="black"> '.$ports['shutdown'].' shutdown</span></a></td>
+      <td><a href="ports/format=list_detail/state=up/"><span class="green"> '.$ports['up'].'</span></a></td>
+      <td><a href="ports/format=list_detail/state=down/"><span class="red"> '.$ports['down'].'</span></a></td>
+      <td><a href="ports/format=list_detail/ignore=1/"><span class="grey"> '.$ports['ignored'].'</span></a></td>
+      <td><a href="ports/format=list_detail/state=admindown/"><span class="black"> '.$ports['shutdown'].'</span></a></td>
     </tr>';
 if ($config['show_services']) {
 
@@ -37,10 +37,10 @@ $temp_output .= '
     <tr class="active">
       <td><a href="services/">Services</a></td>
       <td><a href="services/"><span>'.$services['count'].'</span></a></td>
-      <td><a href="services/state=up/view=details/"><span class="green">'.$services['up'].' up</span></a></td>
-      <td><a href="services/state=down/view=details/"><span class="red"> '.$services['down'].' down</span></a></td>
-      <td><a href="services/ignore=1/view=details/"><span class="grey"> '.$services['ignored'].' ignored</span></a></td>
-      <td><a href="services/disabled=1/view=details/"><span class="black"> '.$services['disabled'].' disabled</span></a></td>
+      <td><a href="services/state=up/view=details/"><span class="green">'.$services['up'].'</span></a></td>
+      <td><a href="services/state=down/view=details/"><span class="red"> '.$services['down'].'</span></a></td>
+      <td><a href="services/ignore=1/view=details/"><span class="grey"> '.$services['ignored'].'</span></a></td>
+      <td><a href="services/disabled=1/view=details/"><span class="black"> '.$services['disabled'].'</span></a></td>
     </tr>';
 }
 $temp_output .= '
diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php
index 46530220c..617b2af91 100644
--- a/html/pages/front/tiles.php
+++ b/html/pages/front/tiles.php
@@ -27,8 +27,11 @@ $dash_config = unserialize(stripslashes($data));
 
 ?>
 
-<a class="btn btn-primary" role="button" data-toggle="collapse" href="#add_widget" aria-expanded="false" aria-controls="add_widget"">Add Widget <i class="fa fa-caret-down fa-fw"></i></a> 
-<a class="btn btn-danger" role="button" id="clear_widgets" name="clear_widgets">Clear dashboard <i class="fa fa-times fa-fw"></i></a>
+<div class="btn-group" role="group">
+    <a class="btn btn-default disabled" role="button">Widgets</a>
+    <a class="btn btn-success" role="button" data-toggle="collapse" href="#add_widget" aria-expanded="false" aria-controls="add_widget"><i class="fa fa-plus fa-fw"></i></a>
+    <a class="btn btn-danger" role="button" id="clear_widgets" name="clear_widgets"><i class="fa fa-trash fa-fw"></i></a>
+</div>
 <div class="collapse" id="add_widget">
   <div class="well">
 <?php