diff --git a/html/pages/device.php b/html/pages/device.php
index c3d47a824c..f17100f6b4 100644
--- a/html/pages/device.php
+++ b/html/pages/device.php
@@ -30,6 +30,13 @@ echo("
   </a>
 </li>");
 
+echo("<li class=" . $select['graphs'] . ">
+  <a href='/device/" . $device['device_id'] . "/graphs/'>
+    <img src='images/16/server_chart.png' align=absmiddle border=0> Graphs
+  </a>
+</li>
+");
+
 if(@mysql_result(mysql_query("select count(vlan_id) from vlans WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
   echo("
 <li class=" . $select['vlans'] . ">
@@ -76,19 +83,12 @@ if($_SESSION[userlevel] >= "5") {
   echo("
 <li class=" . $select['map'] . ">
   <a href='/device/" . $device['device_id'] . "/map/'>
-    <img src='images/16/chart_organisation.png' align=absmiddle border=0> Port Map
+    <img src='images/16/chart_organisation.png' align=absmiddle border=0> Map
   </a>
 </li>
 ");
 }
 
-echo("<li class=" . $select['graphs'] . ">
-  <a href='/device/" . $device['device_id'] . "/graphs/'>
-    <img src='images/16/server_chart.png' align=absmiddle border=0> Host Graphs
-  </a>
-</li>
-");
-
 if($config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `entPhysical` WHERE device_id = '".$_GET['id']."'"), 0) > '0') {
 
   echo("<li class=" . $select['entphysical'] . ">
diff --git a/html/pages/device/bgp.inc.php b/html/pages/device/bgp.inc.php
index b959a36ce4..b14936ae52 100644
--- a/html/pages/device/bgp.inc.php
+++ b/html/pages/device/bgp.inc.php
@@ -1,22 +1,23 @@
 <?php
 
-if($_GET['opta'] == "graphs" || $_GET['opta'] == "graphs") {
+if($_GET['optb'] == "graphs" || $_GET['idb'] == "graphs") {
   $graphs = 1;
 } else {
   $graphs = 0;
 }
 
 echo("
-<div style='float: right; text-align: right;'>
-<a href='/device/" . $_GET['id'] . "/bgp/'>No Graphs</a> | 
-<a href='/device/" . $_GET['id'] . "/bgp/graphs/'>Graphs</a> 
+<div style='padding: 5px; height: 20px; clear: both; display: block;'>
+  <div style='float: left; font-size: 22px; font-weight: bold;'>Local AS : " . $device['bgpLocalAs'] . "</div>
+  <div style='float: right; text-align: right;'>
+  <a href='/device/" . $_GET['id'] . "/bgp/'>No Graphs</a> | 
+  <a href='/device/" . $_GET['id'] . "/bgp/graphs/'>Graphs</a> 
+ </div>
 </div>");
 
 
    echo("<div style='margin: 5px;'><table border=0 cellspacing=1 cellpadding=5 width=100%>");
 
-   echo("<tr><td colspan=6><h2>Local AS : " . $device['bgpLocalAs'] . "</h2></td></tr>");
-
    $i = "1";
    $peer_query = mysql_query("select * from bgpPeers WHERE device_id = '".$device['device_id']."' ORDER BY bgpPeerRemoteAs, bgpPeerIdentifier");
    while($peer = mysql_fetch_array($peer_query)) {