diff --git a/share/views/ajax/report/nodevendor.tt b/share/views/ajax/report/nodevendor.tt
index f189cb81..0e084757 100644
--- a/share/views/ajax/report/nodevendor.tt
+++ b/share/views/ajax/report/nodevendor.tt
@@ -5,10 +5,9 @@
       <tr>
         <th>MAC</th>
         <th>Vendor</th>        
-        <th>Device (Port)</th>
-        <th>Device DNS</th>
-        <th>Device Name</th>
-        <th>Device IP</th>
+        <th>Device (IP)</th>
+        <th>Port</th>
+        <th>VLAN</th>
       </tr>
     </thead>
   </table>
@@ -46,22 +45,20 @@ $(document).ready(function() {
           return '<a href="[% uri_for('/report/nodevendor') | none %]?vendor=' + encodeURIComponent(row.oui.abbrev || 'blank') + '">' + he.encode(row.oui.company ||'(Unknown Vendor)') + '</a>';
         }
       }, {
-        "data": 'port',
+        "data": 'switch',
         "render": function(data, type, row, meta) {
-          return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on">' + he.encode(row.device.dns || row.device.name || row.switch) + '(' + he.encode(data) + ')</a>';
+          return '<a href="[% uri_for('/device') | none %]?q=' + encodeURIComponent(data) + '">' + he.encode(row.device.dns || row.device.name || data) + ' (' + he.encode(data) + ')</a>';
         }
       }, {
-        // Included for filtering
-        "data": 'device.dns',
-        "visible": false
+        "data": 'port',
+        "render": function(data, type, row, meta) {
+          return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on&prefer=port">' + he.encode(data) + '</a>';
+        }
       }, {
-        // Included for filtering
-        "data": 'device.name',
-        "visible": false
-      }, {
-        // Included for filtering
-        "data": 'switch',
-        "visible": false
+        "data": 'vlan',
+        "render": function(data, type, row, meta) {
+          return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on&prefer=vlan">' + he.encode(data) + '</a>';
+        }
       }
     ],
     [% ELSE %]