diff --git a/html/includes/print-interface.inc b/html/includes/print-interface.inc
index 2820ff96d..c47653d58 100644
--- a/html/includes/print-interface.inc
+++ b/html/includes/print-interface.inc
@@ -9,6 +9,9 @@
   $ifSpeed = humanspeed($interface['ifSpeed']);
   $ifPhysAddress = $interface['ifPhysAddress'];
   $ifType = fixiftype($interface['ifType']);
+  $ifHardType = $interface['ifHardType'];
+
+#  echo($interface['ifHardType']);
 
   if($ifAlias) {$ifAlias = $ifAlias . "</br>";}
   if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; }
@@ -22,7 +25,7 @@
               </span><br /><span class=interface-desc>$ifAlias</span>");
   unset ($break);
   if(!$dographs) {
-    $ipdata = mysql_query("SELECT * FROM `ipaddr` WHERE `interface_id` = '$interface[interface_id]'");
+    $ipdata = mysql_query("SELECT * FROM `ipaddr` WHERE `interface_id` = '" . $interface['interface_id'] . "'");
     while($ip = mysql_fetch_Array($ipdata)) {
       echo("$break <a class=interface-desc href=\"javascript:popUp('/netcmd.php?cmd=whois&query=$ip[addr]')\">$ip[addr]/$ip[cidr]</a>");
       $break = " ";
@@ -30,20 +33,22 @@
   echo("</span>");
   echo("</td><td width=70>");
   if($ifSpeed && $ifSpeed != "") { echo("<span class=box-desc>$ifSpeed</span>"); }
+  echo("<br />");
+  if($interface[ifDuplex] != unknown) { echo("<span class=box-desc>Duplex " . $interface['ifDuplex'] . "</span>"); } else { echo("-"); }
+  echo("</td><td width=150>");
+  if($ifType && $ifType != "") { echo("<span class=box-desc>" . $ifType . "</span>"); } else { echo("-"); } 
+  echo("<br />");
+  if($ifHardType && $ifHardType != "") { echo("<span class=box-desc>" . $ifHardType . "</span>"); } else { echo("-"); }
   echo("</td><td width=150>");
-  if($ifType && $iftype != "") { echo("<span class=box-desc>" . $ifType . "</span>"); } else { echo("-"); } 
-  echo("</td><td width=80>");
   if($interface['ifPhysAddress'] && $interface['ifPhysAddress'] != "") { echo("<span class=box-desc>" . $interface['ifPhysAddress'] . "</span>"); } else { echo("-"); }
-  echo("</td><td width=80>");
+  echo("<br />");
   if($interface['ifMtu'] && $interface['ifMtu'] != "") { echo("<span class=box-desc>MTU " . $interface['ifMtu'] . "</span>"); } else { echo("-"); }
-
-#  if($interface[ifDuplex] != unknown) { echo("<span class=box-desc>Duplex " . $interface['ifDuplex'] . "</span>"); } else { echo("-"); }
 }
 
 echo("</td>");
      echo("<td valign=top class=interface-desc>");
      if ( strpos($ifDescr, "oopback") === false && !$dographs) {
-       $link_query = mysql_query("select I.ifDescr, D.hostname, D.id, I.interface_id from links AS L, interfaces AS I, devices AS D WHERE L.src_if = '$if_id' AND L.dst_if = I.interface_id AND I.device_id = D.id");
+       $link_query = mysql_query("select * from links AS L, interfaces AS I, devices AS D WHERE L.src_if = '$if_id' AND L.dst_if = I.interface_id AND I.device_id = D.device_id");
        while($link = mysql_fetch_array($link_query)) {
          echo("<img src='images/16/connect.png' align=absmiddle alt='Directly Connected' /> " . generateiflink($link) . " on " . generatedevicelink($link) . "</a><br />");
          $br = "<br />";
diff --git a/html/pages/interface.php b/html/pages/interface.php
index 68a636cb9..06efcc9b7 100644
--- a/html/pages/interface.php
+++ b/html/pages/interface.php
@@ -1,16 +1,14 @@
 <?
 
-$interface_query = mysql_query("select * from interfaces WHERE id = '$_GET[id]'");
+$interface_query = mysql_query("select * from interfaces WHERE interface_id = '$_GET[id]'");
 $interface = mysql_fetch_array($interface_query);
 
  $device_query = mysql_query("select * from devices where id = '$interface[host]'");
  $device = mysql_fetch_array($device_query);
 
  $hostname = $device['hostname'];
- $hostid   = $device['id'];
- $ifname   = $interface['if'];
- $up = $interface['up'];
- $up_admin = $interface['up_admin'];
+ $hostid   = $device['interface_id'];
+ $ifname   = $interface['ifDescr'];
  $ifIndex   = $interface['ifIndex'];
  $speed = humanspeed($interface['ifSpeed']);
 
@@ -19,9 +17,9 @@ $interface = mysql_fetch_array($interface_query);
  if($interface['ifPhysAddress']) { $mac = "$interface[ifPhysAddress]"; } 
 
  $color = "black";
- if ($up_admin == "down") { $status = "<span class='grey'>Disabled</span>"; }
- if ($up_admin == "up" && $up == "down") { $status = "<span class='red'>Enabled / Disconnected</span>"; }
- if ($up_admin == "up" && $up == "up") { $status = "<span class='green'>Enabled / Connected</span>"; }
+ if ($interface['ifAdminStatus'] == "down") { $status = "<span class='grey'>Disabled</span>"; }
+ if ($interface['ifAdminStatus'] == "up" && $interface['ifOperStatus'] == "down") { $status = "<span class='red'>Enabled / Disconnected</span>"; }
+ if ($interface['ifAdminStatus'] == "up" && $interface['ifOperStatus'] == "up") { $status = "<span class='green'>Enabled / Connected</span>"; }
 
  $i = 1; 
  $inf = fixifName($ifname);
diff --git a/includes/functions.php b/includes/functions.php
index cd58d6ec5..fe976704c 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -300,9 +300,11 @@ function makeshortif($if) {
         $if = str_replace("pos","Pos", $if);
 	$if = str_replace("port-channel","Po", $if);
         $if = str_replace("atm","Atm", $if);
+	$if = str_replace("null", "Null", $if);
 	$if = str_replace("loopback","Lo", $if);        
 	$if = str_replace("dialer","Di", $if);
 	$if = str_replace("vlan","Vlan", $if);
+        $if = str_replace("tunnel","Tunnel", $if);
 	return $if;
 }
 
diff --git a/poll-interface.php b/poll-interface.php
index 2080ffb5e..dbeff73b5 100755
--- a/poll-interface.php
+++ b/poll-interface.php
@@ -121,7 +121,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
   if ($update) {
      $update_query  = "UPDATE `interfaces` SET ";
      $update_query .= $update;
-     $update_query .= " WHERE `id` = '" . $interface['interface_id'] . "'";
+     $update_query .= " WHERE `interface_id` = '" . $interface['interface_id'] . "'";
      echo("Updating : " . $device['hostname'] . " $ifDescr\nSQL :$update_query\n\n");
      $update_result = mysql_query($update_query);
   } else {