diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index e71716769..59ce75d45 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -72,6 +72,7 @@ if ($_SESSION['userlevel'] >= '10') {
            <a href="<?php echo(generate_url(array('page'=>'overview'))); ?>"><i class="fa fa-sitemap fa-fw fa-lg"></i> Maps</a>
            <ul class="dropdown-menu scrollable-menu">
            <li><a href="<?php echo(generate_url(array('page'=>'availability-map'))); ?>"><i class="fa fa-arrow-circle-up fa-fw fa-lg"></i> Availability</a></li>
+           <li><a href="<?php echo(generate_url(array('page'=>'map'))); ?>"><i class="fa fa-desktop fa-fw fa-lg"></i> Device</a></li>
            </ul>
           </li>
             <li role="presentation" class="divider"></li>
@@ -147,8 +148,6 @@ if ($_SESSION['userlevel'] >= '10') {
 }
 
 ?>
-              <li role="presentation" class="divider"></li>
-              <li><a href="map/"><img src="images/16/chart_organisation.png" border="0" alt="Network Map" width="16" height="16" /> Network Map</a></li>
           </ul>
         </li>
 
diff --git a/html/pages/availability-map.inc.php b/html/pages/availability-map.inc.php
index dc63bf16b..fa7bc5a52 100644
--- a/html/pages/availability-map.inc.php
+++ b/html/pages/availability-map.inc.php
@@ -33,8 +33,8 @@ foreach(dbFetchRows($sql) as $device) {
     else {
         $btn_type = 'btn-danger';
     }
+    echo "<a href='" .generate_url(array('page' => 'device', 'device' => $device['device_id'])). "' role='button' class='btn " . $btn_type . " btn-xs' title='" . $device['hostname'] . "' style='min-height:25px; min-width:25px; border-radius:0px;'></a>";
 
-    echo "<a href='/graphs/type=device_uptime/device=" . $device['device_id'] . "/' role='button' class='btn " . $btn_type . " btn-xs' title='" . $device['hostname'] . "' style='min-height:25px; min-width:25px; border-radius:0px;'></a>";
 }
 
-echo "</div>";
+echo "</div>";
\ No newline at end of file