diff --git a/web/gui/src/main/webapp/app/view/app/app.html b/web/gui/src/main/webapp/app/view/app/app.html
index 6f27443..0420cff 100644
--- a/web/gui/src/main/webapp/app/view/app/app.html
+++ b/web/gui/src/main/webapp/app/view/app/app.html
@@ -3,9 +3,9 @@
     <div class="tabular-header">
         <h2>Applications ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
             <div class="separator"></div>
             <div id="app-install"    icon icon-size="36" icon-id="plus" class="active"></div>
             <div id="app-activate"   icon icon-size="36" icon-id="play"></div>
diff --git a/web/gui/src/main/webapp/app/view/cluster/cluster.html b/web/gui/src/main/webapp/app/view/cluster/cluster.html
index 29c84b0..8750cac 100644
--- a/web/gui/src/main/webapp/app/view/cluster/cluster.html
+++ b/web/gui/src/main/webapp/app/view/cluster/cluster.html
@@ -19,9 +19,9 @@
     <div class="tabular-header">
         <h2>Cluster Nodes ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/device/device.html b/web/gui/src/main/webapp/app/view/device/device.html
index 0ff488d..364efc2 100644
--- a/web/gui/src/main/webapp/app/view/device/device.html
+++ b/web/gui/src/main/webapp/app/view/device/device.html
@@ -3,9 +3,9 @@
     <div class="tabular-header">
         <h2>Devices ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.html b/web/gui/src/main/webapp/app/view/flow/flow.html
index 88b15127..a79e925 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.html
+++ b/web/gui/src/main/webapp/app/view/flow/flow.html
@@ -6,9 +6,9 @@
             ({{tableData.length}} total)
         </h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/group/group.html b/web/gui/src/main/webapp/app/view/group/group.html
index e19d6e1..22cd5ee 100644
--- a/web/gui/src/main/webapp/app/view/group/group.html
+++ b/web/gui/src/main/webapp/app/view/group/group.html
@@ -22,9 +22,9 @@
             ({{tableData.length}} total)
         </h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/host/host.html b/web/gui/src/main/webapp/app/view/host/host.html
index 8f83132..ad0e77e 100644
--- a/web/gui/src/main/webapp/app/view/host/host.html
+++ b/web/gui/src/main/webapp/app/view/host/host.html
@@ -3,9 +3,9 @@
     <div class="tabular-header">
         <h2>Hosts ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/intent/intent.html b/web/gui/src/main/webapp/app/view/intent/intent.html
index 8096cea..e60e788 100644
--- a/web/gui/src/main/webapp/app/view/intent/intent.html
+++ b/web/gui/src/main/webapp/app/view/intent/intent.html
@@ -19,9 +19,9 @@
     <div class="tabular-header">
         <h2>Intents ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/link/link.html b/web/gui/src/main/webapp/app/view/link/link.html
index f984c61..dd1f534 100644
--- a/web/gui/src/main/webapp/app/view/link/link.html
+++ b/web/gui/src/main/webapp/app/view/link/link.html
@@ -19,9 +19,9 @@
     <div class="tabular-header">
         <h2>Links ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/port/port.html b/web/gui/src/main/webapp/app/view/port/port.html
index 54611f3..5683ca2 100644
--- a/web/gui/src/main/webapp/app/view/port/port.html
+++ b/web/gui/src/main/webapp/app/view/port/port.html
@@ -22,9 +22,9 @@
             ({{tableData.length}} total)
         </h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
diff --git a/web/gui/src/main/webapp/app/view/settings/settings.html b/web/gui/src/main/webapp/app/view/settings/settings.html
index 6e7dba5..2c89984 100644
--- a/web/gui/src/main/webapp/app/view/settings/settings.html
+++ b/web/gui/src/main/webapp/app/view/settings/settings.html
@@ -3,9 +3,9 @@
     <div class="tabular-header">
         <h2>Component Settings ({{tableData.length}} total)</h2>
         <div class="ctrl-btns">
-            <div class="refresh active"
+            <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="36" icon-id="refresh"
-                 ng-click="refresh(sortParams)"></div>
+                 ng-click="toggleRefresh()"></div>
         </div>
     </div>
 
@@ -17,7 +17,7 @@
              sort-callback="sortCallback(sortParams)">
             <table>
                 <tr>
-                    <td colId="component" sortable col-width="400px">Component </td>
+                    <td colId="component" sortable col-width="350px">Component </td>
                     <td colId="id" sortable>Property </td>
                     <td colId="type" sortable col-width="70px">Type </td>
                     <td colId="value" sortable>Value </td>