diff --git a/html/pages/customers.php b/html/pages/customers.php
index b5c539c03d..36e1b8ea7c 100644
--- a/html/pages/customers.php
+++ b/html/pages/customers.php
@@ -1,7 +1,7 @@
 <?php
 
   $sql  = "SELECT * FROM `interfaces` AS I, `devices` AS D";
-  $sql .= " WHERE I.ifAlias like 'Cust: %' AND I.device_id = D.device_id  ORDER BY I.ifAlias";
+  $sql .= " WHERE I.ifAlias like 'Cust: %' AND I.device_id = D.device_id  ORDER BY I.ifAlias,D.hostname";
   $query = mysql_query($sql);
 
   if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; }
@@ -42,10 +42,10 @@
     } else { 
      if(isset($prev_customer)) {
        echo("<tr bgcolor='$bg_colour'><td></td><td colspan=6>
-       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=$day&to=$now&width=215&height=100'>
-       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=$week&to=$now&width=215&height=100'>
-       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=$month&to=$now&width=215&height=100'>
-       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=$year&to=$now&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($prev_customer)."&type=customer_bits&from=$day&to=$now&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($prev_customer)."&type=customer_bits&from=$week&to=$now&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($prev_customer)."&type=customer_bits&from=$month&to=$now&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($prev_customer)."&type=customer_bits&from=$year&to=$now&width=215&height=100'>
        </td></tr>");
      }
 
diff --git a/html/pages/device/arp.inc.php b/html/pages/device/arp.inc.php
new file mode 100644
index 0000000000..135e4e881e
--- /dev/null
+++ b/html/pages/device/arp.inc.php
@@ -0,0 +1,32 @@
+<?php 
+
+$sql = "SELECT * FROM ipv4_mac AS M, interfaces AS I WHERE I.interface_id = M.interface_id AND I.device_id = '".$device['device_id']."'";
+$query = mysql_query($sql);
+
+echo("<table border=0 cellspacing=0 cellpadding=5 width=100%>");
+$i = "1";
+
+while($arp = mysql_fetch_array($query)) {
+  if(!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; }
+  $arp_host = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_addresses AS A, interfaces AS I, devices AS D WHERE A.ipv4_address = '".$arp['ipv4_address']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id"));
+
+  if($arp_host) { $arp_name = generatedevicelink($arp_host); } else { unset($arp_name); }
+  if($arp_host) { $arp_if = generateiflink($arp_host); } else { unset($arp_if); }
+
+  if($arp_host['device_id'] == $device['device_id']) { $arp_name = "Localhost"; }
+  if($arp_host['interface_id'] == $arp['interface_id']) { $arp_if = "Local Port"; }
+
+  echo("
+  <tr bgcolor=$bg_colour>
+    <td width=200><b>".generateiflink(array_merge($arp, $device))."</b></td>
+    <td width=160>".formatmac($arp['mac_address'])."</td>
+    <td width=140>".$arp['ipv4_address']."</td>
+    <td width=200>$arp_name</td>
+    <td>$arp_if</td>
+  </tr>");
+  $i++;
+}
+
+echo("</table>");
+
+?>
diff --git a/html/pages/device/port/arp.inc.php b/html/pages/device/port/arp.inc.php
new file mode 100644
index 0000000000..9c81131454
--- /dev/null
+++ b/html/pages/device/port/arp.inc.php
@@ -0,0 +1,31 @@
+<?
+
+$sql = "SELECT * FROM ipv4_mac WHERE interface_id = '".$interface['interface_id']."'";
+$query = mysql_query($sql);
+
+echo("<table border=0 cellspacing=0 cellpadding=5 width=100%>");
+$i = "1";
+
+while($arp = mysql_fetch_array($query)) {
+  if(!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; }
+  $arp_host = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_addresses AS A, interfaces AS I, devices AS D WHERE A.ipv4_address = '".$arp['ipv4_address']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id"));
+
+  if($arp_host) { $arp_name = generatedevicelink($arp_host); } else { unset($arp_name); }
+  if($arp_host) { $arp_if = generateiflink($arp_host); } else { unset($arp_if); }
+
+  if($arp_host['device_id'] == $device['device_id']) { $arp_name = "Localhost"; }
+  if($arp_host['interface_id'] == $arp['interface_id']) { $arp_if = "Local Port"; }
+
+  echo("
+  <tr bgcolor=$bg_colour>
+    <td width=160>".formatmac($arp['mac_address'])."</td>
+    <td width=140>".$arp['ipv4_address']."</td>
+    <td width=200>$arp_name</td>
+    <td>$arp_if</td>
+  </tr>");
+  $i++;
+}
+
+echo("</table>");
+
+?>