diff --git a/html/css/styles.css b/html/css/styles.css
index 94697ff523..69ae991a8f 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1588,7 +1588,7 @@ tr.search:nth-child(odd) {
 }
 
 #visualization {
-    width: 90%;
+    width: 100%;
     min-height: 600px;
 }
 
diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php
index ad1bf8a554..45a814e253 100644
--- a/html/includes/print-map.inc.php
+++ b/html/includes/print-map.inc.php
@@ -15,93 +15,160 @@
 //Don't know where this should come from, but it is used later, so I just define it here.
 $row_colour="#ffffff";
 
-$tmp_devices = array();
 $sql_array= array();
 if (!empty($device['hostname'])) {
-    $sql = ' WHERE `devices`.`hostname`=?';
-    $sql_array = array($device['hostname']);
+    $sql = ' AND (`D1`.`hostname`=? OR `D2`.`hostname`=?)';
+    $sql_array = array($device['hostname'], $device['hostname']);
+    $mac_sql = ' AND `D`.`hostname` = ?';
+    $mac_array = array($device['hostname']);
 } else {
-    $sql = ' WHERE 1';
+    $sql = ' ';
 }
 
-$sql .= ' AND `local_device_id` != 0 AND `remote_device_id` != 0 ';
-$sql .= ' AND `local_device_id` IS NOT NULL AND `remote_device_id` IS NOT NULL ';
+if (is_admin() === false && is_read() === false) {
+    $join_sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `D1`.`device_id` = `DP`.`device_id`';
+    $sql  .= ' AND `DP`.`user_id`=?';
+    $sql_array[] = $_SESSION['user_id'];
+}
 
+$tmp_devices = array();
 $tmp_ids = array();
-foreach (dbFetchRows("SELECT DISTINCT least(`devices`.`device_id`, `remote_device_id`) AS `remote_device_id`, GREATEST(`remote_device_id`,`devices`.`device_id`) AS `local_device_id` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` $sql", $sql_array) as $link_devices) {
-    if (!in_array($link_devices['local_device_id'], $tmp_ids) && device_permitted($link_devices['local_device_id'])) {
-        $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id']));
-	if (!empty($link_dev)) {
-            $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box');
-	}
+$tmp_links = array();
+
+
+$ports = dbFetchRows("SELECT
+                             `D1`.`device_id` AS `local_device_id`,
+                             `D1`.`os` AS `local_os`,
+                             `D1`.`hostname` AS `local_hostname`,
+                             `D2`.`device_id` AS `remote_device_id`,
+                             `D2`.`os` AS `remote_os`,
+                             `D2`.`hostname` AS `remote_hostname`,
+                             `P1`.`port_id` AS `local_port_id`,
+                             `P1`.`device_id` AS `local_port_device_id`,
+                             `P1`.`ifName` AS `local_ifname`,
+                             `P1`.`ifSpeed` AS `local_ifspeed`,
+                             `P1`.`ifOperStatus` AS `local_ifoperstatus`,
+                             `P1`.`ifAdminStatus` AS `local_ifadminstatus`,
+                             `P1`.`ifInOctets_rate` AS `local_ifinoctets_rate`,
+                             `P1`.`ifOutOctets_rate` AS `local_ifoutoctets_rate`,
+                             `P2`.`port_id` AS `remote_port_id`,
+                             `P2`.`device_id` AS `remote_port_device_id`,
+                             `P2`.`ifName` AS `remote_ifname`,
+                             `P2`.`ifSpeed` AS `remote_ifspeed`,
+                             `P2`.`ifOperStatus` AS `remote_ifoperstatus`,
+                             `P2`.`ifAdminStatus` AS `remote_ifadminstatus`,
+                             `P2`.`ifInOctets_rate` AS `remote_ifinoctets_rate`,
+                             `P2`.`ifOutOctets_rate` AS `remote_ifoutoctets_rate`
+                      FROM `ipv4_mac` AS `M`
+                             LEFT JOIN `ports` AS `P1` ON `P1`.`port_id`=`M`.`port_id`
+                             LEFT JOIN `ports` AS `P2` ON `P2`.`ifPhysAddress`=`M`.`mac_address`
+                             LEFT JOIN `devices` AS `D1` ON `P1`.`device_id`=`D1`.`device_id`
+                             LEFT JOIN `devices` AS `D2` ON `P2`.`device_id`=`D2`.`device_id`
+                             $join_sql
+                      WHERE
+                             `P1`.`port_id` IS NOT NULL AND
+                             `P2`.`port_id` IS NOT NULL AND
+                             `D1`.`device_id` != `D2`.`device_id`
+                             $sql
+                     ", $sql_array);
+
+$devices = dbFetchRows("SELECT
+                             `D1`.`device_id` AS `local_device_id`,
+                             `D1`.`os` AS `local_os`,
+                             `D1`.`hostname` AS `local_hostname`,
+                             `D2`.`device_id` AS `remote_device_id`,
+                             `D2`.`os` AS `remote_os`,
+                             `D2`.`hostname` AS `remote_hostname`,
+                             `P1`.`port_id` AS `local_port_id`,
+                             `P1`.`device_id` AS `local_port_device_id`,
+                             `P1`.`ifName` AS `local_ifname`,
+                             `P1`.`ifSpeed` AS `local_ifspeed`,
+                             `P1`.`ifOperStatus` AS `local_ifoperstatus`,
+                             `P1`.`ifAdminStatus` AS `local_ifadminstatus`,
+                             `P1`.`ifInOctets_rate` AS `local_ifinoctets_rate`,
+                             `P1`.`ifOutOctets_rate` AS `local_ifoutoctets_rate`,
+                             `P2`.`port_id` AS `remote_port_id`,
+                             `P2`.`device_id` AS `remote_port_device_id`,
+                             `P2`.`ifName` AS `remote_ifname`,
+                             `P2`.`ifSpeed` AS `remote_ifspeed`,
+                             `P2`.`ifOperStatus` AS `remote_ifoperstatus`,
+                             `P2`.`ifAdminStatus` AS `remote_ifadminstatus`,
+                             `P2`.`ifInOctets_rate` AS `remote_ifinoctets_rate`,
+                             `P2`.`ifOutOctets_rate` AS `remote_ifoutoctets_rate`
+                      FROM `links`
+                             LEFT JOIN `devices` AS `D1` ON `D1`.`device_id`=`links`.`local_device_id`
+                             LEFT JOIN `devices` AS `D2` ON `D2`.`device_id`=`links`.`remote_device_id`
+                             LEFT JOIN `ports` AS `P1` ON `P1`.`port_id`=`links`.`local_port_id`
+                             LEFT JOIN `ports` AS `P2` ON `P2`.`port_id`=`links`.`remote_port_id`
+                             $join_sql
+                      WHERE
+                             `active`=1 AND
+                             `local_device_id` != 0 AND
+                             `remote_device_id` != 0 AND
+                             `local_device_id` IS NOT NULL AND
+                             `remote_device_id` IS NOT NULL
+                             $sql
+                      ", $sql_array);
+
+$list = array_merge($ports,$devices);
+
+foreach ($list as $items) {
+    $local_device = array('device_id'=>$items['local_device_id'], 'os'=>$items['local_os'], 'hostname'=>$items['local_hostname']);
+    $remote_device = array('device_id'=>$items['remote_device_id'], 'os'=>$items['remote_os'], 'hostname'=>$items['remote_hostname']);
+
+    $local_port = array('port_id'=>$items['local_port_id'],'device_id'=>$items['local_port_device_id'],'ifName'=>$items['local_ifname'],'ifSpeed'=>$items['local_ifspeed'],'ifOperStatus'=>$items['local_ifoperstatus'],'ifAdminStatus'=>$items['local_adminstatus']);
+    $remote_port = array('port_id'=>$items['remote_port_id'],'device_id'=>$items['remote_port_device_id'],'ifName'=>$items['remote_ifname'],'ifSpeed'=>$items['remote_ifspeed'],'ifOperStatus'=>$items['remote_ifoperstatus'],'ifAdminStatus'=>$items['remote_adminstatus']);
+
+    if (!in_array($items['local_device_id'],$tmp_ids)) {
+        $tmp_devices[] = array('id'=>$items['local_device_id'],'label'=>$items['local_hostname'],'title'=>generate_device_link($local_device,'',array(),'','','',0),'shape'=>'box');
     }
-    if (!in_array($link_devices['remote_device_id'], $tmp_ids) && device_permitted($link_devices['remote_device_id'])) {
-        $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id']));
-	if (!empty($link_dev)) {
-            $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box');
-        }
+    if (!in_array($items['remote_device_id'],$tmp_ids)) {
+        $tmp_devices[] = array('id'=>$items['remote_device_id'],'label'=>$items['remote_hostname'],'title'=>generate_device_link($remote_device,'',array(),'','','',0),'shape'=>'box');
     }
-    array_push($tmp_ids,$link_devices['local_device_id']);
-    array_push($tmp_ids,$link_devices['remote_device_id']);
+    array_push($tmp_ids,$items['local_device_id']);
+    array_push($tmp_ids,$items['remote_device_id']);
+    $speed = $items['local_ifspeed']/1000/1000;
+    if ($speed == 100) {
+        $width = 3;
+    } elseif ($speed == 1000) {
+        $width = 5;
+    } elseif ($speed == 10000) {
+        $width = 10;
+    } elseif ($speed == 40000) {
+        $width = 15;
+    } elseif ($speed == 100000) {
+        $width = 20;
+    } else {
+        $width = 1;
+    }
+    $link_in_used = ($items['local_ifinoctets_rate'] * 8) / $items['local_ifspeed'] * 100;
+    $link_out_used = ($items['local_ifoutoctets_rate'] * 8) / $items['local_ifspeed'] * 100;
+    if ($link_in_used > $link_out_used) {
+        $link_used = $link_in_used;
+    } else {
+        $link_used = $link_out_used;
+    }
+    $link_used = round($link_used, -1);
+    if ($link_used > 100) {
+        $link_used = 100;
+    }
+    $link_color = $config['map_legend'][$link_used];
+    $tmp_links[] = array('from'=>$items['local_device_id'],'to'=>$items['remote_device_id'],'label'=>shorten_interface_type($items['local_ifname']) . ' > ' . shorten_interface_type($items['remote_ifname']),'title'=>generate_port_link($local_port, "<img src='graph.php?type=port_bits&amp;id=".$items['local_port_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=20&amp;legend=no&amp;bg=".str_replace("#","", $row_colour)."'>",'',0,1),'width'=>$width,'color'=>$link_color);
 }
 
-$tmp_ids = implode(',',$tmp_ids);
- 
-$nodes = json_encode($tmp_devices);
- 
-if (is_array($tmp_devices[0])) {
-    $tmp_links = array();
-    foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.*, `remote_port` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) {
-	$port='';
-        foreach ($tmp_devices as $k=>$v) {
-            if ($v['id'] == $link_devices['local_device_id']) {
-                $from = $v['id'];
-                $port = shorten_interface_type($link_devices['ifName']);
-                $port_data = $link_devices;
-            }
-            if ($v['id'] == $link_devices['remote_device_id']) {
-                $to = $v['id'];
-                $port .= ' > ' .shorten_interface_type($link_devices['remote_port']);
-            }
-        }
-        $speed = $link_devices['ifSpeed']/1000/1000;
-        if ($speed == 100) {
-            $width = 3;
-        } elseif ($speed == 1000) {
-            $width = 5;
-        } elseif ($speed == 10000) {
-            $width = 10;
-        } elseif ($speed == 40000) {
-            $width = 15;
-        } elseif ($speed == 100000) {
-            $width = 20;
-        } else {
-            $width = 1;
-        }
-        $link_in_used = ($link_devices['ifInOctets_rate'] * 8) / $link_devices['ifSpeed'] * 100;
-        $link_out_used = ($link_devices['ifOutOctets_rate'] * 8) / $link_devices['ifSpeed'] * 100;
-        if ($link_in_used > $link_out_used) {
-            $link_used = $link_in_used;
-        } else {
-            $link_used = $link_out_used;
-        }
-        $link_used = round($link_used, -1);
-        if ($link_used > 100) {
-            $link_used = 100;
-        }
-        $link_color = $config['map_legend'][$link_used];
+$node_devices = $tmp_devices;
+$nodes = json_encode($node_devices);
+$edges = json_encode($tmp_links);
 
-        $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "<img src='graph.php?type=port_bits&amp;id=".$port_data['port_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=20&amp;legend=no&amp;bg=".str_replace("#","", $row_colour)."'>",'',0,1),'width'=>$width,'color'=>$link_color);
-    }
- 
-    $edges = json_encode($tmp_links);
+if (count($node_devices) > 1 && count($tmp_links) > 0) {
  
 ?>
  
 <div id="visualization"></div>
 <script src="js/vis.min.js"></script>
 <script type="text/javascript">
-
+var height = $(window).height() - 100;
+$('#visualization').height(height + 'px');
     // create an array with nodes
     var nodes =
 <?php
@@ -119,14 +186,17 @@ echo $edges;
     // create a network
     var container = document.getElementById('visualization');
     var data = {
-            nodes: nodes,
+        nodes: nodes,
         edges: edges,
-        stabilize: false
+        stabilize: true
     };
     var options = {
+       autoResize: true,
+       height: '100%',
+       width: '100%',
        physics: {
            barnesHut: {
-               gravitationalConstant: -80000, springConstant: 0.001, springLength: 200
+               gravitationalConstant: -10000, springConstant: 0.001, springLength: 50
            }
        },
        tooltip: {
@@ -142,22 +212,21 @@ echo $edges;
        }
     };
     var network = new vis.Network(container, data, options);
-    network.on("resize", function(params) {console.log(params.width,params.height)});
     network.on('click', function (properties) {
         if (properties.nodes > 0) {
             window.location.href = "/device/device="+properties.nodes+"/tab=map/"
         }
     });
 </script>
-<script>
-var height = $(window).height() - 100;
-$('#visualization').height(height + 'px');
-network.redraw();
-</script>
 
 <?php
 
+} else {
+
+    print_message("No map to display, this may be because you aren't running autodiscovery or no devices are linked by mac address.");
+
 }
 
 $pagetitle[] = "Map";
+
 ?>
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index ffea2d92ed..7e92cec959 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -147,17 +147,9 @@ if ($config['show_locations'])
             <li><a href="delhost/"><i class="fa fa-trash fa-col-info fa-fw fa-lg"></i> Delete Device</a></li>');
 }
 
-if ($links['count'] > 0) {
-
 ?>
               <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>
-<?php
-
-}
-
-?>
-
           </ul>
         </li>
 
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index ff6a427755..709b265499 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -256,15 +256,11 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
-    if ($_SESSION['userlevel'] >= "5" && dbFetchCell("SELECT COUNT(*) FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.port_id = L.local_port_id"))
-    {
-      $discovery_links = TRUE;
       echo('<li class="' . $select['map'] . '">
     <a href="'.generate_device_url($device, array('tab' => 'map')).'">
       <img src="images/16/chart_organisation.png" align="absmiddle" border="0" /> Map
     </a>
   </li>');
-    }
 
     if (@dbFetchCell("SELECT COUNT(*) FROM `packages` WHERE device_id = '".$device['device_id']."'") > '0')
     {
diff --git a/includes/polling/applications/drbd.inc.php b/includes/polling/applications/drbd.inc.php
index c399478cbd..05cafecfc9 100644
--- a/includes/polling/applications/drbd.inc.php
+++ b/includes/polling/applications/drbd.inc.php
@@ -48,4 +48,4 @@ foreach ($ds_list as $ds) {
 
 rrdtool_update($rrd_filename, 'N:'.$drbd['ns'].':'.$drbd['nr'].':'.$drbd['dw'].':'.$drbd['dr'].':'.$drbd['al'].':'.$drbd['bm'].':'.$drbd['lo'].':'.$drbd['pe'].':'.$drbd['ua'].':'.$drbd['ap'].':'.$drbd['oop']);
 
-unset($drbd)
+unset($drbd);