diff --git a/html/includes/graphs/accesspoints/auth.inc.php b/html/includes/graphs/accesspoints/auth.inc.php
index 33c38f094b..7f479a0f21 100644
--- a/html/includes/graphs/accesspoints/auth.inc.php
+++ b/html/includes/graphs/accesspoints/auth.inc.php
@@ -2,7 +2,7 @@
 
 if (is_numeric($vars['id']))
 {
-  $ap = accesspoint_by_id($id);
+  $ap = accesspoint_by_id($vars['id']);
 
   if (is_numeric($ap['device_id']) && ($auth || device_permitted($ap['device_id'])))
   {
diff --git a/html/includes/graphs/accesspoints/interference.inc.php b/html/includes/graphs/accesspoints/interference.inc.php
index b3a0b86156..03128f2ad4 100644
--- a/html/includes/graphs/accesspoints/interference.inc.php
+++ b/html/includes/graphs/accesspoints/interference.inc.php
@@ -1,6 +1,4 @@
 <?php
-$ap=accesspoint_by_id($id);
-$device = device_by_id_cache($ap['device_id']);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". 
 safename("arubaap-$ap[name].$ap[radio_number].rrd");
diff --git a/html/includes/graphs/accesspoints/numasoclients.inc.php b/html/includes/graphs/accesspoints/numasoclients.inc.php
index 4d85fb1047..e0ee8a15d4 100644
--- a/html/includes/graphs/accesspoints/numasoclients.inc.php
+++ b/html/includes/graphs/accesspoints/numasoclients.inc.php
@@ -1,8 +1,5 @@
 <?php
 
-$ap=accesspoint_by_id($id);
-$device = device_by_id_cache($ap['device_id']);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". 
 safename("arubaap-$ap[name].$ap[radio_number].rrd");
 
diff --git a/html/includes/graphs/accesspoints/nummonbssid.inc.php b/html/includes/graphs/accesspoints/nummonbssid.inc.php
index 223067d6d4..c3f5c4ac62 100644
--- a/html/includes/graphs/accesspoints/nummonbssid.inc.php
+++ b/html/includes/graphs/accesspoints/nummonbssid.inc.php
@@ -1,8 +1,5 @@
 <?php
 
-$ap=accesspoint_by_id($id);
-$device = device_by_id_cache($ap['device_id']);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". 
 safename("arubaap-$ap[name].$ap[radio_number].rrd");
 
diff --git a/html/includes/graphs/accesspoints/nummonclients.inc.php b/html/includes/graphs/accesspoints/nummonclients.inc.php
index 010ffd079e..9033ac1d84 100644
--- a/html/includes/graphs/accesspoints/nummonclients.inc.php
+++ b/html/includes/graphs/accesspoints/nummonclients.inc.php
@@ -1,8 +1,5 @@
 <?php
 
-$ap=accesspoint_by_id($id);
-$device = device_by_id_cache($ap['device_id']);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". 
 safename("arubaap-$ap[name].$ap[radio_number].rrd");
 
diff --git a/html/includes/graphs/accesspoints/radioutil.inc.php b/html/includes/graphs/accesspoints/radioutil.inc.php
index 27d2c82505..cde1ed17e1 100644
--- a/html/includes/graphs/accesspoints/radioutil.inc.php
+++ b/html/includes/graphs/accesspoints/radioutil.inc.php
@@ -1,10 +1,5 @@
 <?php
 
-
-
-$ap=accesspoint_by_id($id);
-$device = device_by_id_cache($ap['device_id']);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". 
 safename("arubaap-$ap[name].$ap[radio_number].rrd");
 
diff --git a/html/includes/graphs/accesspoints/txpow.inc.php b/html/includes/graphs/accesspoints/txpow.inc.php
index cc0c60eec9..86ecf07298 100644
--- a/html/includes/graphs/accesspoints/txpow.inc.php
+++ b/html/includes/graphs/accesspoints/txpow.inc.php
@@ -1,10 +1,5 @@
 <?php
 
-
-
-$ap=accesspoint_by_id($id);
-$device = device_by_id_cache($ap['device_id']);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". 
 safename("arubaap-$ap[name].$ap[radio_number].rrd");
 
diff --git a/html/includes/graphs/device/arubacontroller_numaps.inc.php b/html/includes/graphs/device/arubacontroller_numaps.inc.php
new file mode 100644
index 0000000000..44d03334cf
--- /dev/null
+++ b/html/includes/graphs/device/arubacontroller_numaps.inc.php
@@ -0,0 +1,24 @@
+<?php
+
+$device = device_by_id_cache($_REQUEST['device']);
+
+$rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/aruba-controller.rrd";
+
+$rrd_list[0]['filename'] = $rrd_filename;
+$rrd_list[0]['descr'] = "Number of APs";
+$rrd_list[0]['ds'] = "NUMAPS";
+
+$unit_text = "APs";
+$units='';
+$total_units='';
+$colours='mixed';
+
+$scale_min = "0";
+$nototal = 1;
+
+
+if ($rrd_list)
+{
+  include("includes/graphs/generic_multi_line.inc.php");
+}
+?>
diff --git a/html/includes/graphs/device/arubacontroller_numclients.inc.php b/html/includes/graphs/device/arubacontroller_numclients.inc.php
new file mode 100644
index 0000000000..9af7f6a77e
--- /dev/null
+++ b/html/includes/graphs/device/arubacontroller_numclients.inc.php
@@ -0,0 +1,29 @@
+<?php
+
+
+$device = device_by_id_cache($_REQUEST['device']);
+
+$rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/aruba-controller.rrd";
+
+$rrd_list[0]['filename'] = $rrd_filename;
+$rrd_list[0]['descr'] = "Clients";
+$rrd_list[0]['ds'] = "NUMCLIENTS";
+
+$unit_text = "Clients";
+
+$units='';
+$total_units='';
+$colours='mixed';
+
+$scale_min = "0";
+
+$nototal = 1;
+
+if ($rrd_list)
+{
+  include("includes/graphs/generic_multi_line.inc.php");
+}
+
+
+
+?>
diff --git a/html/includes/print-accesspoint-graphs.inc.php b/html/includes/print-accesspoint-graphs.inc.php
index f268af6cb8..28960cfd5d 100644
--- a/html/includes/print-accesspoint-graphs.inc.php
+++ b/html/includes/print-accesspoint-graphs.inc.php
@@ -1,13 +1,13 @@
 <?php
-
 global $config;
 
+
 $graph_array['height'] = "100";
 $graph_array['width']  = "215";
 $graph_array['to']     = $config['time']['now'];
 $graph_array['id']     = $ap['accesspoint_id'];
 $graph_array['type']   = $graph_type;
 
-include("includes/print-quadgraphs.inc.php");
+include("includes/print-graphrow.inc.php");
 
 ?>
diff --git a/html/pages/device/accesspoint.inc.php b/html/pages/device/accesspoint.inc.php
new file mode 100644
index 0000000000..ee4c46a3a7
--- /dev/null
+++ b/html/pages/device/accesspoint.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
+
+$i = "1";
+
+$ap = dbFetchRow("SELECT * FROM `accesspoint` WHERE `device_id` = ? AND `accesspoint_id` = ? AND `deleted` = '0' ORDER BY `name`,`radio_number` ASC", array($device['device_id'],$vars['ap']));
+
+echo("<div class=ifcell style='margin: 0px;'><table width=100% cellpadding=10 cellspacing=0>");
+
+include("includes/print-accesspoint.inc.php");
+
+echo("</table></div>");
+
+
+
+
+
+
+?>
diff --git a/html/pages/device/accesspoints.inc.php b/html/pages/device/accesspoints.inc.php
new file mode 100644
index 0000000000..7040db70d2
--- /dev/null
+++ b/html/pages/device/accesspoints.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
+
+$i = "1";
+
+
+$aps = dbFetchRows("SELECT * FROM `accesspoint` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `name`,`radio_number` ASC", array($device['device_id']));
+echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
+foreach ($aps as $ap)
+{
+  include("includes/print-accesspoint.inc.php");
+  $i++;
+}
+echo("</table></div>");
+
+
+echo "</div>";
+
+?>