diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 4a9921cd9..538ca56e5 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -59,7 +59,7 @@ function generate_device_url($device, $vars=array())
   return generate_url(array('page' => 'device', 'device' => $device['device_id']), $vars);
 }
 
-function generate_device_link($device, $text=0, $vars=array(), $start=0, $end=0)
+function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end=0)
 {
   global $config;
 
@@ -92,10 +92,10 @@ function generate_device_link($device, $text=0, $vars=array(), $start=0, $end=0)
   if ($device['os']) { $contents .= mres($config['os'][$device['os']]['text']); }
   if ($device['version']) { $contents .= " ".mres($device['version']); }
   if ($device['features']) { $contents .= " (".mres($device['features']).")"; }
-#  if ($device['hardware']) { $contents .= " - ".$device['hardware']; }
+  if ($device['hardware']) { $contents .= " - ".$device['hardware']; }
+  if (isset($device['location'])) { $contents .= "<br />" . htmlentities($device['location']); }
   $contents .= "</div>";
 
-#  if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
   foreach ($graphs as $entry)
   {
     $graph     = $entry['graph'];
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index db918ef7e..72476970b 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -442,7 +442,7 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
   { ## FIXME link below broken!
     echo('
         <li><hr width=140></li>
-        <li><a href="routing/protocol=bgp/alerts/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li>
+        <li><a href="routing/protocol=bgp/state=down/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li>
    ');
   }
 
diff --git a/html/pages/routing/bgp.inc.php b/html/pages/routing/bgp.inc.php
index 8fad2c6de..1dadd0a96 100644
--- a/html/pages/routing/bgp.inc.php
+++ b/html/pages/routing/bgp.inc.php
@@ -191,7 +191,7 @@ else
     unset($sep);
 
     echo("  <td></td>
-            <td width=150>" . $localaddresslink . "<br />".generate_device_link($peer, shorthost($peer['hostname']), 'routing/bgp/')."</td>
+            <td width=150>" . $localaddresslink . "<br />".generate_device_link($peer, shorthost($peer['hostname']), array('tab' => 'routing', 'proto' => 'bgp'))."</td>
             <td width=30><b>&#187;</b></td>
             <td width=150>" . $peeraddresslink . "</td>
             <td width=50><b>$peer_type</b></td>