diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index bd49e849..9ba29231 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -177,6 +177,10 @@ div.content > div.tab-content table.nd_floatinghead thead {
   text-align: center;
 }
 
+td.nd_devport_icon i {
+  line-height: 18px;
+}
+
 /* undo nd_center-cell when in a modial dialog (which lives in table cell) */
 .table .nd_center-cell .modal-body {
   text-align: left;
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 3cef731b..e30693be 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -17,7 +17,7 @@
   </tbody>
     [% FOREACH row IN results %]
     <tr>
-      <td class="nd_center-cell">
+      <td class="nd_center-cell nd_devport_icon">
         [% IF row.up_admin != 'up' %]
         <i class="icon-remove"></i>
         [% ELSIF row.stp == 'blocking' %]
@@ -29,6 +29,15 @@
         [% ELSE %]
         <i class="icon-angle-up text-success"></i>
         [% END %]
+        [% IF row.slave_of %]<br/>
+          [% IF row.get_column('agg_master_up_admin') != 'up' %]
+            <small><i class="icon-group muted"></i></small>
+          [% ELSIF row.get_column('agg_master_up') == 'up' %]
+            <small><i class="icon-group text-success"></i></small>
+          [% ELSE %]
+            <small><i class="icon-group text-error"></i></small>
+          [% END %]
+        [% END %]
       </td>
 
       [% FOREACH config IN settings._extra_device_port_cols %]
@@ -73,16 +82,9 @@
             self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]&prefer=port">
         [% row.port | html_entity %]</a>
         [% IF row.slave_of %]<br/>
-          [% IF row.get_column('agg_master_up_admin') != 'up' %]
-            <small><i class="icon-group muted"></i></small>
-          [% ELSIF row.get_column('agg_master_up') == 'up' %]
-            <small><i class="icon-group text-success"></i></small>
-          [% ELSE %]
-            <small><i class="icon-group text-error"></i></small>
-          [% END %]
-          <a class="nd_this-port-only" href="[% uri_for('/device',
+          (<a class="nd_this-port-only" href="[% uri_for('/device',
               self_options) %]&q=[% params.q | uri %]&f=[% row.slave_of | uri %]&prefer=port">
-          [% row.slave_of | html_entity %]</a>
+          [% row.slave_of | html_entity %]</a>)
         [% END %]
       </td>
       [% END %]