diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/style.css
index d599e08c..7e48bad8 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/style.css
@@ -137,7 +137,7 @@ form .clearfix.success input {
 /* draw little up arrow to the right of a label for collapsed list */
 .cell-arrow-up {
   float: left;
-  margin-top: 4px;
+  margin-top: 5px;
   margin-right: 6px;
   border-left: 7px solid transparent;
   border-right: 7px solid transparent;
@@ -147,7 +147,7 @@ form .clearfix.success input {
 /* draw little down arrow to the right of a label for collapsed list */
 .cell-arrow-down {
   float: left;
-  margin-top: 4px;
+  margin-top: 5px;
   margin-right: 6px;
   border-left: 7px solid transparent;
   border-right: 7px solid transparent;
diff --git a/Netdisco/views/ajax/device/ports.tt b/Netdisco/views/ajax/device/ports.tt
index 4a9d77b0..08a9a388 100644
--- a/Netdisco/views/ajax/device/ports.tt
+++ b/Netdisco/views/ajax/device/ports.tt
@@ -77,7 +77,7 @@
           [% SET count = count + 1 %]
         [% END %]
         [% IF count > 10 %]
-        [% SET output = '<a href="#" class="nd_linkcell nd_collapse_vlans">'
+        [% SET output = '<div style="float: right">(' _ count _ ')</div><a href="#" class="nd_linkcell nd_collapse_vlans">'
           _ 'Show VLANs</a><div class="nd_collapse_pre_hidden">' _ output %]
         [% SET output = output _ '</div>' %]
         [% END %]
diff --git a/Netdisco/views/inc/js/device.js b/Netdisco/views/inc/js/device.js
index 30f8d5e0..4ea9c90a 100644
--- a/Netdisco/views/inc/js/device.js
+++ b/Netdisco/views/inc/js/device.js
@@ -69,11 +69,11 @@
 
           // enable collapser on any large vlan lists
           $('.nd_collapse_vlans').collapser({
-            target: 'siblings',
+            target: 'next',
             effect: 'slide',
             changeText: true,
-            expandHtml: '<div class="nd_collapser">Show VLANs<div class="cell-arrow-up"></div></div>',
-            collapseHtml: '<div class="nd_collapser">Hide VLANs<div class="cell-arrow-down"></div></div>',
+            expandHtml: '<div class="cell-arrow-up"></div><div class="nd_collapser">Show VLANs</div>',
+            collapseHtml: '<div class="cell-arrow-down"></div><div class="nd_collapser">Hide VLANs</div>',
           });
         }
       );