diff --git a/glances/outputs/static/js/components/glances/controller.js b/glances/outputs/static/js/components/glances/controller.js
index f8006093..02405ea1 100644
--- a/glances/outputs/static/js/components/glances/controller.js
+++ b/glances/outputs/static/js/components/glances/controller.js
@@ -10,7 +10,6 @@ function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys
         data.isLinux = data.stats['system']['os_name'] === 'Linux';
         data.isMac = data.stats['system']['os_name'] === 'Darwin';
         data.isWindows = data.stats['system']['os_name'] === 'Windows';
-        vm.is_disconnected = false;
 
         $scope.$broadcast('data_refreshed', data);
         vm.dataLoaded = true;
@@ -19,7 +18,7 @@ function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys
     };
 
     var refreshDataError = function() {
-        vm.is_disconnected = true;
+        $scope.$broadcast('is_disconnected');
         nextLoad();
     };
 
diff --git a/glances/outputs/static/js/components/plugin-system/controller.js b/glances/outputs/static/js/components/plugin-system/controller.js
index 10148c6a..f8e52b35 100644
--- a/glances/outputs/static/js/components/plugin-system/controller.js
+++ b/glances/outputs/static/js/components/plugin-system/controller.js
@@ -19,5 +19,10 @@ function GlancesPluginSystemController($scope) {
       vm.os.name = stats['os_name'];
       vm.os.version = stats['os_version'];
       vm.humanReadableName = stats['hr_name'];
+      vm.isDisconnected = false;
+    });
+
+    $scope.$on('is_disconnected', function() {
+      vm.isDisconnected = true;
     });
 }
diff --git a/glances/outputs/static/public/js/main.min.js b/glances/outputs/static/public/js/main.min.js
index 4a895401..e749be28 100644
--- a/glances/outputs/static/public/js/main.min.js
+++ b/glances/outputs/static/public/js/main.min.js
@@ -325,7 +325,6 @@ function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys
         data.isLinux = data.stats['system']['os_name'] === 'Linux';
         data.isMac = data.stats['system']['os_name'] === 'Darwin';
         data.isWindows = data.stats['system']['os_name'] === 'Windows';
-        vm.is_disconnected = false;
 
         $scope.$broadcast('data_refreshed', data);
         vm.dataLoaded = true;
@@ -334,7 +333,7 @@ function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys
     };
 
     var refreshDataError = function() {
-        vm.is_disconnected = true;
+        $scope.$broadcast('is_disconnected');
         nextLoad();
     };
 
@@ -459,6 +458,32 @@ function GlancesPluginAlertController($scope, favicoService) {
 
 'use strict';
 
+glancesApp.component('glancesPluginCloud', {
+    controller: GlancesPluginCloudController,
+    controllerAs: 'vm',
+    templateUrl: 'components/plugin-cloud/view.html'
+});
+
+'use strict';
+
+function GlancesPluginCloudController($scope) {
+    var vm = this;
+
+    vm.provider = null;
+    vm.instance = null;
+
+    $scope.$on('data_refreshed', function(event, data) {
+      var stats = data.stats['cloud'];
+
+      if (stats['ami-id'] !== undefined) {
+          vm.provider = 'AWS EC2';
+          vm.instance =  stats['instance-type'] + ' instance ' + stats['instance-id'] + ' (' + stats['region'] + ')';
+      }
+    });
+}
+
+'use strict';
+
 glancesApp.component('glancesPluginCpu', {
     controller: GlancesPluginCpuController,
     controllerAs: 'vm',
@@ -525,32 +550,6 @@ function GlancesPluginCpuController($scope) {
 
 'use strict';
 
-glancesApp.component('glancesPluginCloud', {
-    controller: GlancesPluginCloudController,
-    controllerAs: 'vm',
-    templateUrl: 'components/plugin-cloud/view.html'
-});
-
-'use strict';
-
-function GlancesPluginCloudController($scope) {
-    var vm = this;
-
-    vm.provider = null;
-    vm.instance = null;
-
-    $scope.$on('data_refreshed', function(event, data) {
-      var stats = data.stats['cloud'];
-
-      if (stats['ami-id'] !== undefined) {
-          vm.provider = 'AWS EC2';
-          vm.instance =  stats['instance-type'] + ' instance ' + stats['instance-id'] + ' (' + stats['region'] + ')';
-      }
-    });
-}
-
-'use strict';
-
 glancesApp.component('glancesPluginDiskio', {
     controller: GlancesPluginDiskioController,
     controllerAs: 'vm',
@@ -649,39 +648,6 @@ function GlancesPluginFsController($scope, $filter) {
 
 'use strict';
 
-glancesApp.component('glancesPluginIp', {
-    controller: GlancesPluginIpController,
-    controllerAs: 'vm',
-    bindings: {
-        arguments: '<'
-    },
-    templateUrl: 'components/plugin-ip/view.html'
-});
-
-'use strict';
-
-function GlancesPluginIpController($scope) {
-    var vm = this;
-
-    vm.address = null;
-    vm.gateway = null;
-    vm.mask = null;
-    vm.maskCidr = null;
-    vm.publicAddress = null;
-
-    $scope.$on('data_refreshed', function(event, data) {
-      var ipStats = data.stats['ip'];
-
-      vm.address = ipStats.address;
-      vm.gateway = ipStats.gateway;
-      vm.mask = ipStats.mask;
-      vm.maskCidr = ipStats.mask_cidr;
-      vm.publicAddress = ipStats.public_address
-    });
-}
-
-'use strict';
-
 glancesApp.component('glancesPluginLoad', {
     controller: GlancesPluginLoadController,
     controllerAs: 'vm',
@@ -758,6 +724,39 @@ function GlancesPluginMemController($scope) {
 
 'use strict';
 
+glancesApp.component('glancesPluginIp', {
+    controller: GlancesPluginIpController,
+    controllerAs: 'vm',
+    bindings: {
+        arguments: '<'
+    },
+    templateUrl: 'components/plugin-ip/view.html'
+});
+
+'use strict';
+
+function GlancesPluginIpController($scope) {
+    var vm = this;
+
+    vm.address = null;
+    vm.gateway = null;
+    vm.mask = null;
+    vm.maskCidr = null;
+    vm.publicAddress = null;
+
+    $scope.$on('data_refreshed', function(event, data) {
+      var ipStats = data.stats['ip'];
+
+      vm.address = ipStats.address;
+      vm.gateway = ipStats.gateway;
+      vm.mask = ipStats.mask;
+      vm.maskCidr = ipStats.mask_cidr;
+      vm.publicAddress = ipStats.public_address
+    });
+}
+
+'use strict';
+
 glancesApp.component('glancesPluginMemMore', {
     controller: GlancesPluginMemMoreController,
     controllerAs: 'vm',
@@ -786,44 +785,6 @@ function GlancesPluginMemMoreController($scope) {
 
 'use strict';
 
-glancesApp.component('glancesPluginMemswap', {
-    controller: GlancesPluginMemswapController,
-    controllerAs: 'vm',
-    templateUrl: 'components/plugin-memswap/view.html'
-});
-
-'use strict';
-
-function GlancesPluginMemswapController($scope) {
-    var vm = this;
-    var _view = {};
-
-    vm.percent = null;
-    vm.total = null;
-    vm.used = null;
-    vm.free = null;
-
-    $scope.$on('data_refreshed', function(event, data) {
-      var stats = data.stats['memswap'];
-      _view = data.view['memswap'];
-
-      vm.percent = stats['percent'];
-      vm.total = stats['total'];
-      vm.used = stats['used'];
-      vm.free = stats['free'];
-    });
-
-    this.getDecoration = function (value) {
-        if (_view[value] === undefined) {
-            return;
-        }
-
-        return _view[value].decoration.toLowerCase();
-    };
-}
-
-'use strict';
-
 glancesApp.component('glancesPluginNetwork', {
     controller: GlancesPluginNetworkController,
     controllerAs: 'vm',
@@ -1097,41 +1058,6 @@ function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter
 
 'use strict';
 
-glancesApp.component('glancesPluginSystem', {
-    controller: GlancesPluginSystemController,
-    controllerAs: 'vm',
-    bindings: {
-        isDisconnected: '<'
-    },
-    templateUrl: 'components/plugin-system/view.html'
-});
-
-'use strict';
-
-function GlancesPluginSystemController($scope) {
-    var vm = this;
-
-    vm.hostname = null;
-    vm.platform = null;
-    vm.humanReadableName = null;
-    vm.os = {
-        'name': null,
-        'version': null
-    };
-
-    $scope.$on('data_refreshed', function(event, data) {
-      var stats = data.stats['system'];
-
-      vm.hostname = stats['hostname'];
-      vm.platform = stats['platform'];
-      vm.os.name = stats['os_name'];
-      vm.os.version = stats['os_version'];
-      vm.humanReadableName = stats['hr_name'];
-    });
-}
-
-'use strict';
-
 glancesApp.component('glancesPluginQuicklook', {
     controller: GlancesPluginQuicklookController,
     controllerAs: 'vm',
@@ -1186,20 +1112,41 @@ function GlancesPluginQuicklookController($scope) {
 
 'use strict';
 
-glancesApp.component('glancesPluginUptime', {
-    controller: GlancesPluginUptimeController,
+glancesApp.component('glancesPluginSystem', {
+    controller: GlancesPluginSystemController,
     controllerAs: 'vm',
-    templateUrl: 'components/plugin-uptime/view.html'
+    bindings: {
+        isDisconnected: '<'
+    },
+    templateUrl: 'components/plugin-system/view.html'
 });
 
 'use strict';
 
-function GlancesPluginUptimeController($scope) {
+function GlancesPluginSystemController($scope) {
     var vm = this;
-    vm.value = null;
+
+    vm.hostname = null;
+    vm.platform = null;
+    vm.humanReadableName = null;
+    vm.os = {
+        'name': null,
+        'version': null
+    };
 
     $scope.$on('data_refreshed', function(event, data) {
-      vm.value = data.stats['uptime'];
+      var stats = data.stats['system'];
+
+      vm.hostname = stats['hostname'];
+      vm.platform = stats['platform'];
+      vm.os.name = stats['os_name'];
+      vm.os.version = stats['os_version'];
+      vm.humanReadableName = stats['hr_name'];
+      vm.isDisconnected = false;
+    });
+
+    $scope.$on('is_disconnected', function() {
+      vm.isDisconnected = true;
     });
 }
 
@@ -1250,3 +1197,60 @@ function GlancesPluginWifiController($scope, $filter) {
         return _view[hotpost.ssid][field].decoration.toLowerCase();
     };
 }
+
+'use strict';
+
+glancesApp.component('glancesPluginUptime', {
+    controller: GlancesPluginUptimeController,
+    controllerAs: 'vm',
+    templateUrl: 'components/plugin-uptime/view.html'
+});
+
+'use strict';
+
+function GlancesPluginUptimeController($scope) {
+    var vm = this;
+    vm.value = null;
+
+    $scope.$on('data_refreshed', function(event, data) {
+      vm.value = data.stats['uptime'];
+    });
+}
+
+'use strict';
+
+glancesApp.component('glancesPluginMemswap', {
+    controller: GlancesPluginMemswapController,
+    controllerAs: 'vm',
+    templateUrl: 'components/plugin-memswap/view.html'
+});
+
+'use strict';
+
+function GlancesPluginMemswapController($scope) {
+    var vm = this;
+    var _view = {};
+
+    vm.percent = null;
+    vm.total = null;
+    vm.used = null;
+    vm.free = null;
+
+    $scope.$on('data_refreshed', function(event, data) {
+      var stats = data.stats['memswap'];
+      _view = data.view['memswap'];
+
+      vm.percent = stats['percent'];
+      vm.total = stats['total'];
+      vm.used = stats['used'];
+      vm.free = stats['free'];
+    });
+
+    this.getDecoration = function (value) {
+        if (_view[value] === undefined) {
+            return;
+        }
+
+        return _view[value].decoration.toLowerCase();
+    };
+}
diff --git a/glances/outputs/static/public/js/templates.min.js b/glances/outputs/static/public/js/templates.min.js
index 0146ea7b..11022c5b 100644
--- a/glances/outputs/static/public/js/templates.min.js
+++ b/glances/outputs/static/public/js/templates.min.js
@@ -1,22 +1,22 @@
 angular.module('glancesApp').run(['$templateCache', function($templateCache) {$templateCache.put('components/glances/view.html','<div>\n    <div ng-if="!vm.dataLoaded" class="container-fluid" id="loading-page">\n        <div class="glances-logo"></div>\n        <div class="loader">Loading...</div>\n    </div>\n\n    <glances-help ng-if="vm.arguments.help_tag"></glances-help>\n\n    <div ng-show="vm.dataLoaded && !vm.arguments.help_tag" class="container-fluid">\n        <div class="top-plugin">\n            <div class="row">\n                <div class="col-sm-24">\n                    <div class="pull-left">\n                        <glances-plugin-system></glances-plugin-system>\n                    </div>\n                    <div class="pull-left">\n                        <glances-plugin-ip arguments="vm.arguments"></glances-plugin-ip>\n                    </div>\n                    <div class="pull-right">\n                        <glances-plugin-uptime></glances-plugin-uptime>\n                    </div>\n                </div>\n                <div class="row">\n                    <div class="col-sm-24">\n                        <div class="pull-left">\n                            <glances-plugin-cloud></glances-plugin-cloud>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n\n        <div class="row">\n            <div class="hidden-xs hidden-sm hidden-md col-lg-6" ng-if="!vm.arguments.disable_quicklook">\n                <glances-plugin-quicklook arguments="vm.arguments"></glances-plugin-quicklook>\n            </div>\n            <div class="col-sm-6 col-md-8 col-lg-6" ng-if="!vm.arguments.disable_cpu && !vm.arguments.percpu">\n                <glances-plugin-cpu></glances-plugin-cpu>\n            </div>\n            <div class="col-sm-12 col-md-8 col-lg-6" ng-if="!vm.arguments.disable_cpu && vm.arguments.percpu">\n                <glances-plugin-percpu></glances-plugin-percpu>\n            </div>\n            <div class="hidden-xs hidden-sm col-md-4 col-lg-3" ng-if="!vm.arguments.disable_gpu && statsGpu.gpus.length > 0">\n                <glances-plugin-gpu></glances-plugin-gpu>\n            </div>\n            <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!vm.argumentsdisable_mem">\n                <glances-plugin-mem></glances-plugin-mem>\n            </div>\n            <div class="hidden-xs hidden-sm col-md-4 col-lg-3"\n                 ng-if="!vm.arguments.disable_mem && !(!vm.arguments.disable_gpu && statsGpu.gpus.length > 0)">\n                <glances-plugin-mem-more></glances-plugin-mem-more>\n            </div>\n            <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!vm.arguments.disable_memswap">\n                <glances-plugin-memswap></glances-plugin-memswap>\n            </div>\n            <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!vm.arguments.disable_load">\n                <glances-plugin-load></glances-plugin-load>\n            </div>\n        </div>\n        <div class="row">\n            <div class="col-sm-6 sidebar" ng-if="!vm.arguments.disable_left_sidebar">\n                <div class="table">\n                    <glances-plugin-network id="plugin-network" class="plugin table-row-group" arguments="vm.arguments" ng-if="!vm.arguments.disable_network"></glances-plugin-network>\n                    <glances-plugin-wifi id="plugin-wifi" class="plugin table-row-group" ng-if="!vm.arguments.disable_wifi"></glances-plugin-wifi>\n                    <glances-plugin-ports id="plugin-ports" class="plugin table-row-group" ng-if="!vm.arguments.disable_ports"></glances-plugin-ports>\n                    <glances-plugin-diskio id="plugin-diskio" class="plugin table-row-group" arguments="vm.arguments" ng-if="!vm.arguments.disable_diskio"></glances-plugin-diskio>\n                    <glances-plugin-fs id="plugin-fs" class="plugin table-row-group" arguments="vm.arguments" ng-if="!vm.arguments.disable_fs"></glances-plugin-fs>\n                    <glances-plugin-irq arguments="vm.arguments" ng-if="vm.arguments.enable_irq"></glances-plugin-irq>\n                    <glances-plugin-folders arguments="vm.arguments" ng-if="!vm.arguments.disable_fs"></glances-plugin-folders>\n                    <glances-plugin-raid arguments="vm.arguments"></glances-plugin-raid>\n                    <glances-plugin-sensors arguments="vm.arguments" ng-if="!vm.arguments.disable_sensors"></glances-plugin-sensors>\n                </div>\n            </div>\n            <div class="col-sm-18">\n                <glances-plugin-docker arguments="vm.arguments" ng-if="!vm.arguments.disable_docker"></glances-plugin-docker>\n                <glances-plugin-alert ng-if="!vm.arguments.disable_alert"></glances-plugin-alert>\n                <glances-plugin-process arguments="vm.arguments"></glances-plugin-process>\n            </div>\n            </div>\n        </div>\n    </div>\n</div>\n');
 $templateCache.put('components/help/view.html','  <div  class="container-fluid">\n    <div class="row">\n        <div class="col-sm-12 col-lg-24">{{vm.help.version}} {{vm.help.psutil_version}}</div>\n    </div>\n    <div class="row">&nbsp;</div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-24">{{vm.help.configuration_file}}</div>\n    </div>\n    <div class="row">&nbsp;</div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_auto}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_network}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_cpu}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_alert}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_mem}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.percpu}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_user}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_ip}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_proc}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_docker}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_io}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.view_network_io_combination}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.sort_cpu_times}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.view_cumulative_network}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_diskio}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_filesytem_freespace}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_filesystem}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_vm.help}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_network}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.diskio_iops}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_sensors}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_top_menu}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_left_sidebar}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_amp}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_process_stats}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.show_hide_irq}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_gpu}}</div>\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_mean_gpu}}</div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_quick_look}}</div>\n        <div class="col-sm-12 col-lg-6"></div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_short_processname}}</div>\n        <div class="col-sm-12 col-lg-6"></div>\n    </div>\n    <div class="row">\n        <div class="col-sm-12 col-lg-6">{{vm.help.enable_disable_ports}}</div>\n        <div class="col-sm-12 col-lg-6"></div>\n    </div>\n\n  </div>\n');
 $templateCache.put('components/plugin-alert/view.html','<section id="alerts">\n    <span class="title" ng-if="!vm.hasAlerts()">No warning or critical alert detected</span>\n    <span class="title" ng-if="vm.hasAlerts()">Warning or critical alerts (lasts {{vm.count()}} entries)</span>\n</section>\n<section id="alert" class="plugin">\n    <div class="table">\n        <div class="table-row" ng-repeat="alert in vm.getAlerts()">\n            <div class="table-cell text-left">\n                {{alert.begin | date : \'yyyy-MM-dd H:mm:ss\'}} ({{ alert.ongoing ? \'ongoing\' : alert.duration }}) - <span ng-hide="alert.ongoing">{{alert.level}} on</span> <span class="{{ alert.level | lowercase }}">{{alert.name}}</span> ({{alert.max}})\n            </div>\n        </div>\n    </div>\n</section>\n');
-$templateCache.put('components/plugin-cpu/view.html','<section id="cpu" class="plugin">\n    <div class="row">\n        <div class="col-sm-24 col-md-12 col-lg-8">\n            <div class="table">\n                <div class="table-row">\n                    <div class="table-cell text-left title">CPU</div>\n                    <div class="table-cell">{{ vm.total }}%</div>\n                </div>\n                <div class="table-row">\n                    <div class="table-cell text-left">user:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'user\')">\n                        {{ vm.user }}%\n                    </div>\n                </div>\n                <div class="table-row">\n                    <div class="table-cell text-left">system:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'system\')">\n                        {{ vm.system }}%\n                    </div>\n                </div>\n                <div class="table-row">\n                    <div class="table-cell text-left">idle:</div>\n                    <div class="table-cell">{{ vm.idle }}%</div>\n                </div>\n            </div>\n        </div>\n        <div class="hidden-xs hidden-sm col-md-12 col-lg-8">\n            <div class="table">\n                <div class="table-row">\n                    <div class="table-cell text-left">nice:</div>\n                    <div class="table-cell">\n                        {{ vm.nice }}%\n                    </div>\n                </div>\n                <div class="table-row" ng-show="vm.irq != undefined">\n                    <div class="table-cell text-left">irq:</div>\n                    <div class="table-cell">\n                        {{ vm.irq }}%\n                    </div>\n                </div>\n                <div class="table-row" ng-show="vm.iowait != undefined">\n                    <div class="table-cell text-left">iowait:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'iowait\')">\n                        {{ vm.iowait }}%\n                    </div>\n                </div>\n                <div class="table-row" ng-show="vm.steal != undefined">\n                    <div class="table-cell text-left">steal:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'steal\')">\n                        {{ vm.steal }}%\n                    </div>\n                </div>\n            </div>\n        </div>\n        <div class="hidden-xs hidden-sm hidden-md col-lg-8">\n            <div class="table">\n                <div class="table-row" ng-if="vm.ctx_switches">\n                    <div class="table-cell text-left">ctx_sw:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'ctx_switches\')">\n                        {{ vm.ctx_switches }}\n                    </div>\n                </div>\n                <div class="table-row" ng-if="vm.interrupts">\n                    <div class="table-cell text-left">inter:</div>\n                    <div class="table-cell">\n                        {{ vm.interrupts }}\n                    </div>\n                </div>\n                <div class="table-row" ng-if="vm.soft_interrupts">\n                    <div class="table-cell text-left">sw_int:</div>\n                    <div class="table-cell">\n                        {{ vm.soft_interrupts }}\n                    </div>\n                </div>\n                <div class="table-row" ng-if="!statsSystem.isLinux() && vm.syscalls">\n                    <div class="table-cell text-left">syscal:</div>\n                    <div class="table-cell">\n                        {{ vm.syscalls }}\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n</section>\n');
 $templateCache.put('components/plugin-cloud/view.html','<section id="cloud">\n  <span class="title">{{ vm.provider }}</span> {{ vm.instance }}\n</section>\n');
+$templateCache.put('components/plugin-cpu/view.html','<section id="cpu" class="plugin">\n    <div class="row">\n        <div class="col-sm-24 col-md-12 col-lg-8">\n            <div class="table">\n                <div class="table-row">\n                    <div class="table-cell text-left title">CPU</div>\n                    <div class="table-cell">{{ vm.total }}%</div>\n                </div>\n                <div class="table-row">\n                    <div class="table-cell text-left">user:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'user\')">\n                        {{ vm.user }}%\n                    </div>\n                </div>\n                <div class="table-row">\n                    <div class="table-cell text-left">system:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'system\')">\n                        {{ vm.system }}%\n                    </div>\n                </div>\n                <div class="table-row">\n                    <div class="table-cell text-left">idle:</div>\n                    <div class="table-cell">{{ vm.idle }}%</div>\n                </div>\n            </div>\n        </div>\n        <div class="hidden-xs hidden-sm col-md-12 col-lg-8">\n            <div class="table">\n                <div class="table-row">\n                    <div class="table-cell text-left">nice:</div>\n                    <div class="table-cell">\n                        {{ vm.nice }}%\n                    </div>\n                </div>\n                <div class="table-row" ng-show="vm.irq != undefined">\n                    <div class="table-cell text-left">irq:</div>\n                    <div class="table-cell">\n                        {{ vm.irq }}%\n                    </div>\n                </div>\n                <div class="table-row" ng-show="vm.iowait != undefined">\n                    <div class="table-cell text-left">iowait:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'iowait\')">\n                        {{ vm.iowait }}%\n                    </div>\n                </div>\n                <div class="table-row" ng-show="vm.steal != undefined">\n                    <div class="table-cell text-left">steal:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'steal\')">\n                        {{ vm.steal }}%\n                    </div>\n                </div>\n            </div>\n        </div>\n        <div class="hidden-xs hidden-sm hidden-md col-lg-8">\n            <div class="table">\n                <div class="table-row" ng-if="vm.ctx_switches">\n                    <div class="table-cell text-left">ctx_sw:</div>\n                    <div class="table-cell" ng-class="vm.getDecoration(\'ctx_switches\')">\n                        {{ vm.ctx_switches }}\n                    </div>\n                </div>\n                <div class="table-row" ng-if="vm.interrupts">\n                    <div class="table-cell text-left">inter:</div>\n                    <div class="table-cell">\n                        {{ vm.interrupts }}\n                    </div>\n                </div>\n                <div class="table-row" ng-if="vm.soft_interrupts">\n                    <div class="table-cell text-left">sw_int:</div>\n                    <div class="table-cell">\n                        {{ vm.soft_interrupts }}\n                    </div>\n                </div>\n                <div class="table-row" ng-if="!statsSystem.isLinux() && vm.syscalls">\n                    <div class="table-cell text-left">syscal:</div>\n                    <div class="table-cell">\n                        {{ vm.syscalls }}\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n</section>\n');
 $templateCache.put('components/plugin-diskio/view.html','<div class="table-row" ng-show="vm.disks.length > 0">\n    <div class="table-cell text-left title">DISK I/O</div>\n    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">R/s</div>\n    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">W/s</div>\n\n    <div class="table-cell" ng-show="vm.arguments.diskio_iops">IOR/s</div>\n    <div class="table-cell" ng-show="vm.arguments.diskio_iops">IOW/s</div>\n</div>\n<div class="table-row" ng-repeat="disk in vm.disks track by name">\n    <div class="table-cell text-left">{{(disk.alias ? disk.alias : disk.name) | min_size}}</div>\n    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{disk.bitrate.txps }}</div>\n    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{disk.bitrate.rxps }}</div>\n\n    <div class="table-cell" ng-show="vm.arguments.diskio_iops">{{disk.count.txps }}</div>\n    <div class="table-cell" ng-show="vm.arguments.diskio_iops">{{disk.count.rxps }}</div>\n</div>\n');
 $templateCache.put('components/plugin-fs/view.html','<div class="table-row">\n    <div class="table-cell text-left title">FILE SYS</div>\n    <div class="table-cell">\n        <span ng-show="!vm.arguments.fs_free_space">Used</span>\n        <span ng-show="vm.arguments.fs_free_space">Free</span>\n    </div>\n    <div class="table-cell">Total</div>\n</div>\n<div class="table-row" ng-repeat="fs in vm.fileSystems">\n    <div class="table-cell text-left">{{ fs.shortMountPoint }} <span class="visible-lg-inline" ng-show="fs.name.length <= 20">({{ fs.name }})<span></div>\n    <div class="table-cell" ng-class="vm.getDecoration(fs.mountPoint, \'used\')">\n        <span ng-show="!vm.arguments.fs_free_space">{{ fs.used | bytes }}</span>\n        <span ng-show="vm.arguments.fs_free_space">{{ fs.free | bytes }}</span>\n    </div>\n    <div class="table-cell">{{ fs.size | bytes }}</div>\n</div>\n');
-$templateCache.put('components/plugin-ip/view.html','<section id="ip" ng-if="vm.address != undefined && !vm.arguments.disable_ip">\n  &nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ vm.address }}/{{ vm.maskCidr }}</span>&nbsp;<span ng-if="vm.publicAddress" class="title">Pub</span>&nbsp;<span>{{ vm.publicAddress }}</span>\n</section>\n');
 $templateCache.put('components/plugin-load/view.html','<section id="load" class="plugin" ng-if="vm.cpucore != undefined">\n  <div class="table">\n      <div class="table-row">\n          <div class="table-cell text-left title">LOAD</div>\n          <div class="table-cell">{{ vm.cpucore }}-core</div>\n      </div>\n      <div class="table-row">\n          <div class="table-cell text-left">1 min:</div>\n          <div class="table-cell">\n              {{ vm.min1 | number : 2}}\n          </div>\n      </div>\n      <div class="table-row">\n          <div class="table-cell text-left">5 min:</div>\n          <div class="table-cell" ng-class="vm.getDecoration(\'min5\')">\n              {{ vm.min5 | number : 2}}\n          </div>\n      </div>\n      <div class="table-row">\n          <div class="table-cell text-left">15 min:</div>\n          <div class="table-cell" ng-class="vm.getDecoration(\'min15\')">\n              {{ vm.min15 | number : 2}}\n          </div>\n      </div>\n  </div>\n</section>\n');
 $templateCache.put('components/plugin-mem/view.html','<section id="mem" class="plugin">\n    <div class="table">\n        <div class="table-row">\n            <div class="table-cell text-left title">MEM</div>\n            <div class="table-cell">{{ vm.percent }}%</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">total:</div>\n            <div class="table-cell">{{ vm.total | bytes }}</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">used:</div>\n            <div class="table-cell" ng-class="vm.getDecoration(\'used\')">\n                {{ vm.used | bytes:2 }}\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">free:</div>\n            <div class="table-cell">{{ vm.free | bytes }}</div>\n        </div>\n    </div>\n</section>\n');
+$templateCache.put('components/plugin-ip/view.html','<section id="ip" ng-if="vm.address != undefined && !vm.arguments.disable_ip">\n  &nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ vm.address }}/{{ vm.maskCidr }}</span>&nbsp;<span ng-if="vm.publicAddress" class="title">Pub</span>&nbsp;<span>{{ vm.publicAddress }}</span>\n</section>\n');
 $templateCache.put('components/plugin-mem-more/view.html','<section id="mem-more" class="plugin">\n    <div class="table">\n        <div class="table-row">\n            <div class="table-cell text-left">active:</div>\n            <div class="table-cell">{{ vm.active | bytes }}</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">inactive:</div>\n            <div class="table-cell">{{ vm.inactive | bytes }}</div>\n        </div>\n        <div class="table-row" ng-show="vm.buffers != undefined">\n            <div class="table-cell text-left">buffers:</div>\n            <div class="table-cell">{{ vm.buffers | bytes }}</div>\n        </div>\n        <div class="table-row" ng-show="vm.cached != undefined">\n            <div class="table-cell text-left">cached:</div>\n            <div class="table-cell">{{ vm.cached | bytes }}</div>\n        </div>\n    </div>\n</section>\n');
-$templateCache.put('components/plugin-memswap/view.html','<section id="memswap" class="plugin">\n    <div class="table">\n        <div class="table-row">\n            <div class="table-cell text-left title">SWAP</div>\n            <div class="table-cell">{{ vm.percent }}%</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">total:</div>\n            <div class="table-cell">{{ vm.total | bytes }}</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">used:</div>\n            <div class="table-cell" ng-class="vm.getDecoration(\'used\')">\n                {{ vm.used | bytes }}\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">free:</div>\n            <div class="table-cell">{{ vm.free | bytes }}</div>\n        </div>\n    </div>\n</section>\n');
 $templateCache.put('components/plugin-network/view.html','<div class="table-row">\n  <div class="table-cell text-left title">NETWORK</div>\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && !vm.arguments.network_sum">Rx/s</div>\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && !vm.arguments.network_sum">Tx/s</div>\n\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && vm.arguments.network_sum"></div>\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && vm.arguments.network_sum">Rx+Tx/s</div>\n\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && !vm.arguments.network_sum">Rx</div>\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && !vm.arguments.network_sum">Tx</div>\n\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && vm.arguments.network_sum"></div>\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && vm.arguments.network_sum">Rx+Tx</div>\n</div>\n<div class="table-row" ng-repeat="network in vm.networks track by network.interfaceName">\n  <div class="table-cell text-left">{{ network.interfaceName | min_size }}</div>\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && !vm.arguments.network_sum">{{ vm.arguments.byte ? (network.rx / network.time_since_update | bytes) : (network.rx / network.time_since_update | bits) }}</div>\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && !vm.arguments.network_sum">{{ vm.arguments.byte ? (network.tx / network.time_since_update | bytes) : (network.tx / network.time_since_update | bits) }}</div>\n\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && vm.arguments.network_sum"></div>\n  <div class="table-cell" ng-show="!vm.arguments.network_cumul && vm.arguments.network_sum">{{ vm.arguments.byte ? (network.cx / network.time_since_update | bytes) : (network.cx / network.time_since_update | bits) }}</div>\n\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && !vm.arguments.network_sum">{{ vm.arguments.byte ? (network.cumulativeRx | bytes) : (network.cumulativeRx | bits) }}</div>\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && !vm.arguments.network_sum">{{ vm.arguments.byte ? (network.cumulativeTx | bytes) : (network.cumulativeTx | bits) }}</div>\n\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && vm.arguments.network_sum"></div>\n  <div class="table-cell" ng-show="vm.arguments.network_cumul && vm.arguments.network_sum">{{ vm.arguments.byte ? (network.cumulativeCx | bytes) : (network.cumulativeCx | bits) }}</div>\n</div>\n');
 $templateCache.put('components/plugin-percpu/view.html','<section id="percpu" class="plugin">\n    <div class="table">\n        <div class="table-row">\n            <div class="table-cell text-left title">PER CPU</div>\n            <div class="table-cell" ng-repeat="percpu in vm.cpus">{{ percpu.total }}%</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">user:</div>\n            <div class="table-cell" ng-repeat="percpu in vm.cpus" ng-class="vm.getUserAlert(percpu)">\n                {{ percpu.user }}%\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">system:</div>\n            <div class="table-cell" ng-repeat="percpu in vm.cpus" ng-class="vm.getSystemAlert(percpu)">\n                {{ percpu.system }}%\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">idle:</div>\n            <div class="table-cell" ng-repeat="percpu in vm.cpus">{{ percpu.idle }}%</div>\n        </div>\n        <div class="table-row" ng-show="vm.cpus[0].iowait">\n            <div class="table-cell text-left">iowait:</div>\n            <div class="table-cell" ng-repeat="percpu in vm.cpus" ng-class="vm.getSystemAlert(percpu)">\n                {{ percpu.iowait }}%\n            </div>\n        </div>\n        <div class="table-row" ng-show="vm.cpus[0].steal">\n            <div class="table-cell text-left">steal:</div>\n            <div class="table-cell" ng-repeat="percpu in vm.cpus" ng-class="vm.getSystemAlert(percpu)">\n                {{ percpu.steal }}%\n            </div>\n        </div>\n    </div>\n</section>\n');
 $templateCache.put('components/plugin-ports/view.html','<div class="table-row" ng-repeat="port in vm.ports">\n    <div class="table-cell text-left">{{(port.description ? port.description : port.host + \' \' + port.port) | min_size: 20}}</div>\n    <div class="table-cell"></div>\n    <div ng-switch="port.status" ng-class="vm.getDecoration(port)" class="table-cell">\n        <span ng-switch-when="null">Scanning</span>\n        <span ng-switch-when="false">Timeout</span>\n        <span ng-switch-when="true">Open</span>\n        <span ng-switch-default>{{port.status * 1000.0 | number:0}}ms</span>\n    </div>\n</div>');
 $templateCache.put('components/plugin-process/view.html','<div ng-show="!vm.arguments.disable_process">\n  <glances-plugin-processcount sorter="vm.sorter"></glances-plugin-processcount>\n  <glances-plugin-amps arguments="vm.arguments" ng-if="!vm.arguments.disable_amps"></glances-plugin-amps>\n  <glances-plugin-processlist arguments="vm.arguments" sorter="vm.sorter"></glances-plugin-processlist>\n</div>\n<div ng-show="vm.arguments.disable_process">PROCESSES DISABLED (press \'z\' to display)</div>\n');
 $templateCache.put('components/plugin-processcount/view.html','<section id="processcount" class="plugin">\n  <span class="title">TASKS</span>\n  <span>{{ vm.total }} ({{ vm.thread }} thr),</span>\n  <span>{{ vm.running }} run,</span>\n  <span>{{ vm.sleeping }} slp,</span>\n  <span>{{ vm.stopped }} oth</span>\n  <span> sorted {{ vm.sorter.auto ? \'automatically\' : \'\' }} by {{ vm.sorter.getColumnLabel(vm.sorter.column) }}, flat view</span>\n</section>');
 $templateCache.put('components/plugin-processlist/view.html','<section id="processlist-plugin" class="plugin">\n  <div class="table">\n    <div class="table-row">\n      <div sortable-th sorter="vm.sorter" column="cpu_percent" class="table-cell">CPU%</div>\n      <div sortable-th sorter="vm.sorter" column="memory_percent" class="table-cell">MEM%</div>\n      <div class="table-cell hidden-xs hidden-sm">VIRT</div>\n      <div class="table-cell hidden-xs hidden-sm">RES</div>\n      <div class="table-cell">PID</div>\n      <div sortable-th sorter="vm.sorter" column="username" class="table-cell text-left">USER</div>\n      <div class="table-cell">NI</div>\n      <div class="table-cell">S</div>\n      <div sortable-th sorter="vm.sorter" column="timemillis" class="table-cell hidden-xs hidden-sm">TIME+</div>\n      <div sortable-th sorter="vm.sorter" column="io_read" class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">IOR/s</div>\n      <div sortable-th sorter="vm.sorter" column="io_write" class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">IOW/s</div>\n      <div sortable-th sorter="vm.sorter" column="name" class="table-cell text-left">Command</div>\n    </div>\n    <div class="table-row" ng-repeat="process in vm.processes | orderBy:vm.sorter.column:vm.sorter.isReverseColumn(vm.sorter.column) | limitTo: vm.getLimit() track by process.pid">\n      <div class="table-cell" ng-class="vm.getCpuPercentAlert(process)">{{process.cpu_percent | number:1}}</div>\n      <div class="table-cell" ng-class="vm.getMemoryPercentAlert(process)">{{process.memory_percent | number:1}}</div>\n      <div class="table-cell hidden-xs hidden-sm">{{process.memvirt | bytes}}</div>\n      <div class="table-cell hidden-xs hidden-sm">{{process.memres | bytes}}</div>\n      <div class="table-cell">{{process.pid}}</div>\n      <div class="table-cell text-left">{{process.username}}</div>\n      <div class="table-cell" ng-class="{nice: process.isNice}">{{process.nice | exclamation}}</div>\n      <div class="table-cell" ng-class="{status: process.status == \'R\'}">{{process.status}}</div>\n      <div class="table-cell hidden-xs hidden-sm">\n        <span ng-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>{{ process.timeplus.minutes | leftPad:2:\'0\' }}:{{ process.timeplus.seconds | leftPad:2:\'0\' }}<span ng-show="process.timeplus.hours <= 0">.{{ process.timeplus.milliseconds | leftPad:2:\'0\' }}</span>\n      </div>\n      <div class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioRead}}</div>\n      <div class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioWrite}}</div>\n      <div class="table-cell text-left" ng-show="vm.arguments.process_short_name">{{process.name}}</div>\n      <div class="table-cell text-left" ng-show="!vm.arguments.process_short_name">{{process.cmdline}}</div>\n    </div>\n  </div>\n</section>\n');
-$templateCache.put('components/plugin-system/view.html','<section id="system">\n  <span ng-if="vm.isDisconnected" class="critical">Disconnected from</span>\n  <span class="title">{{ vm.hostname }}</span>\n  <span ng-show="vm.stats.isLinux" class="hidden-xs hidden-sm">({{ vm.humanReadableName }} / {{ vm.os.name }} {{ vm.os.version }})</span>\n  <span ng-show="!vm.stats.isLinux" class="hidden-xs hidden-sm">({{ vm.os.name }} {{ vm.os.version }} {{ vm.platform }})</span>\n</section>\n');
 $templateCache.put('components/plugin-quicklook/view.html','<section id="quicklook-plugin" class="plugin">\n    <div class="cpu-name">\n        {{ vm.cpu_name }}\n    </div>\n    <div class="table">\n        <div class="table-row" ng-show="!vm.arguments.percpu">\n            <div class="table-cell text-left">CPU</div>\n            <div class="table-cell">\n                <div class="progress">\n                    <div class="progress-bar progress-bar-{{ vm.getDecoration(\'cpu\') }}" role="progressbar" aria-valuenow="{{ vm.cpu }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ vm.cpu }}%;">\n                        &nbsp;\n                    </div>\n                </div>\n            </div>\n            <div class="table-cell">\n                {{ vm.cpu }}%\n            </div>\n        </div>\n        <div class="table-row" ng-show="vm.arguments.percpu" ng-repeat="percpu in vm.percpus">\n            <div class="table-cell text-left">CPU{{ percpu.number }}</div>\n            <div class="table-cell">\n                <div class="progress">\n                    <div class="progress-bar progress-bar-{{ vm.getDecoration(\'cpu\') }}" role="progressbar" aria-valuenow="{{ percpu.total }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percpu.total }}%;">\n                        &nbsp;\n                    </div>\n                </div>\n            </div>\n            <div class="table-cell">\n                {{ percpu.total }}%\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">MEM</div>\n            <div class="table-cell">\n                <div class="progress">\n                    <div class="progress-bar progress-bar-{{ vm.getDecoration(\'mem\') }}" role="progressbar" aria-valuenow="{{ vm.mem }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ vm.mem }}%;">\n                        &nbsp;\n                    </div>\n                </div>\n            </div>\n            <div class="table-cell">\n                {{ vm.mem }}%\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">SWAP</div>\n            <div class="table-cell">\n                <div class="progress">\n                    <div class="progress-bar progress-bar-{{ vm.getDecoration(\'swap\') }}" role="progressbar" aria-valuenow="{{ vm.swap }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ vm.swap }}%;">\n                        &nbsp;\n                    </div>\n                </div>\n            </div>\n            <div class="table-cell">\n                {{ vm.swap }}%\n            </div>\n        </div>\n    </div>\n</section>\n');
+$templateCache.put('components/plugin-system/view.html','<section id="system">\n  <span ng-if="vm.isDisconnected" class="critical">Disconnected from</span>\n  <span class="title">{{ vm.hostname }}</span>\n  <span ng-show="vm.stats.isLinux" class="hidden-xs hidden-sm">({{ vm.humanReadableName }} / {{ vm.os.name }} {{ vm.os.version }})</span>\n  <span ng-show="!vm.stats.isLinux" class="hidden-xs hidden-sm">({{ vm.os.name }} {{ vm.os.version }} {{ vm.platform }})</span>\n</section>\n');
+$templateCache.put('components/plugin-wifi/view.html','<section id="wifi" class="plugin table-row-group" ng-if="vm.hotspots.length > 0">\n  <div class="table-row">\n    <div class="table-cell text-left title">WIFI</div>\n    <div class="table-cell"></div>\n    <div class="table-cell">dBm</div>\n  </div>\n  <div class="table-row" ng-repeat="hotspot in vm.hotspots track by ssid">\n    <div class="table-cell text-left">{{ hotspot.ssid|limitTo:20 }} <span ng-if="hotspot.encrypted">{{ hotspot.encryption_type }}</span></div>\n    <div class="table-cell"></div>\n    <div class="table-cell" ng-class="vm.getDecoration(hotspot, \'signal\')">{{ hotspot.signal }}</div>\n  </div>\n</section>\n');
 $templateCache.put('components/plugin-uptime/view.html','<section id="uptime">\n  <span>Uptime: {{ vm.value }}</span>\n</section>\n');
-$templateCache.put('components/plugin-wifi/view.html','<section id="wifi" class="plugin table-row-group" ng-if="vm.hotspots.length > 0">\n  <div class="table-row">\n    <div class="table-cell text-left title">WIFI</div>\n    <div class="table-cell"></div>\n    <div class="table-cell">dBm</div>\n  </div>\n  <div class="table-row" ng-repeat="hotspot in vm.hotspots track by ssid">\n    <div class="table-cell text-left">{{ hotspot.ssid|limitTo:20 }} <span ng-if="hotspot.encrypted">{{ hotspot.encryption_type }}</span></div>\n    <div class="table-cell"></div>\n    <div class="table-cell" ng-class="vm.getDecoration(hotspot, \'signal\')">{{ hotspot.signal }}</div>\n  </div>\n</section>\n');}]);
\ No newline at end of file
+$templateCache.put('components/plugin-memswap/view.html','<section id="memswap" class="plugin">\n    <div class="table">\n        <div class="table-row">\n            <div class="table-cell text-left title">SWAP</div>\n            <div class="table-cell">{{ vm.percent }}%</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">total:</div>\n            <div class="table-cell">{{ vm.total | bytes }}</div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">used:</div>\n            <div class="table-cell" ng-class="vm.getDecoration(\'used\')">\n                {{ vm.used | bytes }}\n            </div>\n        </div>\n        <div class="table-row">\n            <div class="table-cell text-left">free:</div>\n            <div class="table-cell">{{ vm.free | bytes }}</div>\n        </div>\n    </div>\n</section>\n');}]);
\ No newline at end of file