diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 9276a4a1..cf49eb61 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -233,13 +233,15 @@
       <td>
         [% IF params.c_neighbors AND (row.remote_ip OR row.is_uplink) %]
           [% IF row.neighbor %]
-          <i class="icon-link[% ' text-warning' IF row.manual_topo %]"></i>
-          <a href="[% uri_for('/device',
-                self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]">
+            <i class="icon-link[% ' text-warning' IF row.manual_topo %]"></i>
+            <a href="[% uri_for('/device',
+                  self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]">
             [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
-            ([% row.remote_port | html_entity %]
-            [% ' id: '_ row.remote_id IF row.remote_id %]
-            [% ' type: '_ row.remote_type IF row.remote_type %])</a>
+            - [% row.remote_port | html_entity %]</a><br/>
+            [% IF params.neigh_id %]
+              ([% 'id: '_ row.remote_id IF row.remote_id %]
+              [% ' type: '_ row.remote_type IF row.remote_type %])
+            [% END %]
           [% ELSIF row.remote_ip AND row.remote_port %]
             [% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %]
               <i class="icon-phone"></i>&nbsp;
@@ -248,12 +250,14 @@
             [% ELSE %]
               <i class="icon-unlink text-error"></i>&nbsp;
             [% END %]
-          <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
-            [% row.remote_ip | html_entity %] (port: [% row.remote_port | html_entity %]
-            [% ' id: '_ row.remote_id IF row.remote_id %]
-            [% ' type: '_ row.remote_type IF row.remote_type %])</a>
+            <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
+              [% row.remote_ip | html_entity %] - [% row.remote_port | html_entity %]</a><br/>
+            [% IF params.neigh_id %]
+              ([% 'id: '_ row.remote_id IF row.remote_id %]
+              [% ' type: '_ row.remote_type IF row.remote_type %])
+            [% END %]
           [% ELSE %]
-          <i class="icon-unlink text-error"></i>&nbsp; (possible uplink)
+            <i class="icon-unlink text-error"></i>&nbsp; (possible uplink)
           [% END %]
         [% END %]
         [% IF params.c_nodes %]
diff --git a/Netdisco/share/views/sidebar/device/ports.tt b/Netdisco/share/views/sidebar/device/ports.tt
index 4f7b3efa..eb789ae1 100644
--- a/Netdisco/share/views/sidebar/device/ports.tt
+++ b/Netdisco/share/views/sidebar/device/ports.tt
@@ -105,6 +105,13 @@
                       </select>
                     </div>
                   </li>
+                  <li>
+                    <label class="checkbox">
+                      <input type="checkbox" id="neigh_id"
+                        name="neigh_id"[% ' checked="checked"' IF params.neigh_id %] />
+                      Connected Device ID
+                    </label>
+                  </li>
                 </ul>
               </div>
             </div>