diff --git a/glances/outputs/static/html/plugins/cpu.html b/glances/outputs/static/html/plugins/cpu.html
index 82315ff9..53175592 100644
--- a/glances/outputs/static/html/plugins/cpu.html
+++ b/glances/outputs/static/html/plugins/cpu.html
@@ -25,7 +25,7 @@
     </div>
     <div class="hidden-xs hidden-sm col-md-12 col-lg-8">
         <div class="table">
-            <div class="table-row">
+            <div class="table-row" ng-show="statsCpu.nice != undefined">
                 <div class="table-cell text-left">nice:</div>
                 <div class="table-cell">
                     {{ statsCpu.nice }}%
diff --git a/glances/outputs/static/html/plugins/mem_more.html b/glances/outputs/static/html/plugins/mem_more.html
index 080060ae..49d831dd 100644
--- a/glances/outputs/static/html/plugins/mem_more.html
+++ b/glances/outputs/static/html/plugins/mem_more.html
@@ -1,9 +1,9 @@
 <div class="table">
-    <div class="table-row">
+    <div class="table-row" ng-show="statsMem.active != undefined">
         <div class="table-cell text-left">active:</div>
         <div class="table-cell">{{ statsMem.active | bytes }}</div>
     </div>
-    <div class="table-row">
+    <div class="table-row" ng-show="statsMem.inactive != undefined">
         <div class="table-cell text-left">inactive:</div>
         <div class="table-cell">{{ statsMem.inactive | bytes }}</div>
     </div>
diff --git a/glances/outputs/static/public/js/templates.min.js b/glances/outputs/static/public/js/templates.min.js
index 7a8a76fd..3c0c4f24 100644
--- a/glances/outputs/static/public/js/templates.min.js
+++ b/glances/outputs/static/public/js/templates.min.js
@@ -2,7 +2,7 @@ angular.module('glancesApp').run(['$templateCache', function($templateCache) {$t
 $templateCache.put('plugins/alerts.html','<span class="title" ng-show="!statsAlert.hasAlerts()">No warning or critical alert detected</span>\n<span class="title" ng-show="statsAlert.hasAlerts()">Warning or critical alerts (lasts {{statsAlert.count()}} entries)</span>\n');
 $templateCache.put('plugins/amps.html','<div class="table">\n    <div class="table-row" ng-repeat="process in statsAmps.processes">\n        <div class="table-cell text-left" ng-class="statsAmps.getDescriptionDecoration(process)">{{ process.name }}</div>\n        <div class="table-cell text-left">{{ process.count }}</div>\n        <div class="table-cell text-left process-result">{{ process.result }}</div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/cloud.html','<span class="title">{{ statsCloud.getProvider() }}</span> {{ statsCloud.getInstance() }}\n');
-$templateCache.put('plugins/cpu.html','<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">{{ statsCpu.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="statsCpu.getDecoration(\'user\')">\n                    {{ statsCpu.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="statsCpu.getDecoration(\'system\')">\n                    {{ statsCpu.system }}%\n                </div>\n            </div>\n            <div class="table-row">\n                <div class="table-cell text-left">idle:</div>\n                <div class="table-cell">{{ statsCpu.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                    {{ statsCpu.nice }}%\n                </div>\n            </div>\n            <div class="table-row" ng-show="statsCpu.irq != undefined">\n                <div class="table-cell text-left">irq:</div>\n                <div class="table-cell">\n                    {{ statsCpu.irq }}%\n                </div>\n            </div>\n            <div class="table-row" ng-show="statsCpu.iowait != undefined">\n                <div class="table-cell text-left">iowait:</div>\n                <div class="table-cell" ng-class="statsCpu.getDecoration(\'iowait\')">\n                    {{ statsCpu.iowait }}%\n                </div>\n            </div>\n            <div class="table-row" ng-show="statsCpu.steal != undefined">\n                <div class="table-cell text-left">steal:</div>\n                <div class="table-cell" ng-class="statsCpu.getDecoration(\'steal\')">\n                    {{ statsCpu.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="statsCpu.ctx_switches">\n                <div class="table-cell text-left">ctx_sw:</div>\n                <div class="table-cell" ng-class="statsCpu.getDecoration(\'ctx_switches\')">\n                    {{ statsCpu.ctx_switches }}\n                </div>\n            </div>\n            <div class="table-row" ng-if="statsCpu.interrupts">\n                <div class="table-cell text-left">inter:</div>\n                <div class="table-cell">\n                    {{ statsCpu.interrupts }}\n                </div>\n            </div>\n            <div class="table-row" ng-if="statsCpu.soft_interrupts">\n                <div class="table-cell text-left">sw_int:</div>\n                <div class="table-cell">\n                    {{ statsCpu.soft_interrupts }}\n                </div>\n            </div>\n            <div class="table-row" ng-if="!statsSystem.isLinux() && statsCpu.syscalls">\n                <div class="table-cell text-left">syscal:</div>\n                <div class="table-cell">\n                    {{ statsCpu.syscalls }}\n                </div>\n            </div>\n        </div>\n    </div>\n</div>\n');
+$templateCache.put('plugins/cpu.html','<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">{{ statsCpu.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="statsCpu.getDecoration(\'user\')">\n                    {{ statsCpu.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="statsCpu.getDecoration(\'system\')">\n                    {{ statsCpu.system }}%\n                </div>\n            </div>\n            <div class="table-row">\n                <div class="table-cell text-left">idle:</div>\n                <div class="table-cell">{{ statsCpu.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" ng-show="statsCpu.nice != undefined">\n                <div class="table-cell text-left">nice:</div>\n                <div class="table-cell">\n                    {{ statsCpu.nice }}%\n                </div>\n            </div>\n            <div class="table-row" ng-show="statsCpu.irq != undefined">\n                <div class="table-cell text-left">irq:</div>\n                <div class="table-cell">\n                    {{ statsCpu.irq }}%\n                </div>\n            </div>\n            <div class="table-row" ng-show="statsCpu.iowait != undefined">\n                <div class="table-cell text-left">iowait:</div>\n                <div class="table-cell" ng-class="statsCpu.getDecoration(\'iowait\')">\n                    {{ statsCpu.iowait }}%\n                </div>\n            </div>\n            <div class="table-row" ng-show="statsCpu.steal != undefined">\n                <div class="table-cell text-left">steal:</div>\n                <div class="table-cell" ng-class="statsCpu.getDecoration(\'steal\')">\n                    {{ statsCpu.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="statsCpu.ctx_switches">\n                <div class="table-cell text-left">ctx_sw:</div>\n                <div class="table-cell" ng-class="statsCpu.getDecoration(\'ctx_switches\')">\n                    {{ statsCpu.ctx_switches }}\n                </div>\n            </div>\n            <div class="table-row" ng-if="statsCpu.interrupts">\n                <div class="table-cell text-left">inter:</div>\n                <div class="table-cell">\n                    {{ statsCpu.interrupts }}\n                </div>\n            </div>\n            <div class="table-row" ng-if="statsCpu.soft_interrupts">\n                <div class="table-cell text-left">sw_int:</div>\n                <div class="table-cell">\n                    {{ statsCpu.soft_interrupts }}\n                </div>\n            </div>\n            <div class="table-row" ng-if="!statsSystem.isLinux() && statsCpu.syscalls">\n                <div class="table-cell text-left">syscal:</div>\n                <div class="table-cell">\n                    {{ statsCpu.syscalls }}\n                </div>\n            </div>\n        </div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/diskio.html','<div class="table-row">\n    <div class="table-cell text-left title">DISK I/O</div>\n    <div class="table-cell" ng-show="!arguments.diskio_iops">R/s</div>\n    <div class="table-cell" ng-show="!arguments.diskio_iops">W/s</div>\n\n    <div class="table-cell" ng-show="arguments.diskio_iops">IOR/s</div>\n    <div class="table-cell" ng-show="arguments.diskio_iops">IOW/s</div>\n</div>\n<div class="table-row" ng-repeat="disk in statsDiskio.disks">\n    <div class="table-cell text-left">{{(disk.alias ? disk.alias : disk.name) | min_size}}</div>\n    <div class="table-cell" ng-show="!arguments.diskio_iops">{{disk.bitrate.txps }}</div>\n    <div class="table-cell" ng-show="!arguments.diskio_iops">{{disk.bitrate.rxps }}</div>\n\n    <div class="table-cell" ng-show="arguments.diskio_iops">{{disk.count.txps }}</div>\n    <div class="table-cell" ng-show="arguments.diskio_iops">{{disk.count.rxps }}</div>\n</div>\n');
 $templateCache.put('plugins/docker.html','<span class="title">CONTAINERS</span> {{ statsDocker.containers.length }} (served by Docker {{ statsDocker.version }})\n\n<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left">Name</div>\n        <div class="table-cell">Status</div>\n        <div class="table-cell">CPU%</div>\n        <div class="table-cell">MEM</div>\n        <div class="table-cell">IOR/s</div>\n        <div class="table-cell">IOW/s</div>\n        <div class="table-cell">RX/s</div>\n        <div class="table-cell">TX/s</div>\n        <div class="table-cell text-left">Command</div>\n    </div>\n    <div class="table-row" ng-repeat="container in statsDocker.containers">\n        <div class="table-cell text-left">{{ container.name }}</div>\n        <div class="table-cell" ng-class="container.status == \'Paused\' ? \'careful\' : \'ok\'">{{ container.status }}</div>\n        <div class="table-cell">{{ container.cpu | number:1 }}</div>\n        <div class="table-cell">{{ container.memory | bytes }}</div>\n        <div class="table-cell">{{ container.ior / container.io_time_since_update | bits }}</div>\n        <div class="table-cell">{{ container.iow / container.io_time_since_update | bits }}</div>\n        <div class="table-cell">{{ container.rx / container.net_time_since_update | bits }}</div>\n        <div class="table-cell">{{ container.tx / container.net_time_since_update | bits }}</div>\n        <div class="table-cell text-left">{{ container.command }}</div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/folders.html','<div class="table-row">\n    <div class="table-cell text-left title">FOLDERS</div>\n    <div class="table-cell">Size</div>\n</div>\n<div class="table-row" ng-repeat="folder in statsFolders.folders">\n    <div class="table-cell text-left">{{ folder.path }}</div>\n    <div class="table-cell" ng-class="statsFolders.getDecoration(folder)">{{ folder.size | bytes }}</div>\n</div>\n');
@@ -12,7 +12,7 @@ $templateCache.put('plugins/ip.html','&nbsp;-&nbsp;<span class="title">IP</span>
 $templateCache.put('plugins/irq.html','<div class="table-row">\n    <div class="table-cell text-left title">IRQ</div>\n    <div class="table-cell"></div>\n    <div class="table-cell">Rate/s</div>\n</div>\n<div class="table-row" ng-repeat="irq in statsIrq.irqs">\n    <div class="table-cell text-left">{{irq.irq_line}}</div>\n    <div class="table-cell"></div>\n    <div class="table-cell"><span>{{irq.irq_rate}}</span></div>\n</div>\n');
 $templateCache.put('plugins/load.html','<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left title">LOAD</div>\n        <div class="table-cell">{{ statsLoad.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            {{ statsLoad.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="statsLoad.getDecoration(\'min5\')">\n            {{ statsLoad.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="statsLoad.getDecoration(\'min15\')">\n            {{ statsLoad.min15 | number : 2}}\n        </div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/mem.html','<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left title">MEM</div>\n        <div class="table-cell">{{ statsMem.percent }}%</div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">total:</div>\n        <div class="table-cell">{{ statsMem.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="statsMem.getDecoration(\'used\')">\n            {{ statsMem.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">{{ statsMem.free | bytes }}</div>\n    </div>\n</div>\n');
-$templateCache.put('plugins/mem_more.html','<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left">active:</div>\n        <div class="table-cell">{{ statsMem.active | bytes }}</div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">inactive:</div>\n        <div class="table-cell">{{ statsMem.inactive | bytes }}</div>\n    </div>\n    <div class="table-row" ng-show="statsMem.buffers != undefined">\n        <div class="table-cell text-left">buffers:</div>\n        <div class="table-cell">{{ statsMem.buffers | bytes }}</div>\n    </div>\n    <div class="table-row" ng-show="statsMem.cached != undefined">\n        <div class="table-cell text-left">cached:</div>\n        <div class="table-cell">{{ statsMem.cached | bytes }}</div>\n    </div>\n</div>\n');
+$templateCache.put('plugins/mem_more.html','<div class="table">\n    <div class="table-row" ng-show="statsMem.active != undefined">\n        <div class="table-cell text-left">active:</div>\n        <div class="table-cell">{{ statsMem.active | bytes }}</div>\n    </div>\n    <div class="table-row" ng-show="statsMem.inactive != undefined">\n        <div class="table-cell text-left">inactive:</div>\n        <div class="table-cell">{{ statsMem.inactive | bytes }}</div>\n    </div>\n    <div class="table-row" ng-show="statsMem.buffers != undefined">\n        <div class="table-cell text-left">buffers:</div>\n        <div class="table-cell">{{ statsMem.buffers | bytes }}</div>\n    </div>\n    <div class="table-row" ng-show="statsMem.cached != undefined">\n        <div class="table-cell text-left">cached:</div>\n        <div class="table-cell">{{ statsMem.cached | bytes }}</div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/memswap.html','<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left title">SWAP</div>\n        <div class="table-cell">{{ statsMemSwap.percent }}%</div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">total:</div>\n        <div class="table-cell">{{ statsMemSwap.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="statsMemSwap.getDecoration(\'used\')">\n            {{ statsMemSwap.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">{{ statsMemSwap.free | bytes }}</div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/network.html','<div class="table-row">\n    <div class="table-cell text-left title">NETWORK</div>\n    <div class="table-cell" ng-show="!arguments.network_cumul && !arguments.network_sum">Rx/s</div>\n    <div class="table-cell" ng-show="!arguments.network_cumul && !arguments.network_sum">Tx/s</div>\n\n    <div class="table-cell" ng-show="!arguments.network_cumul && arguments.network_sum"></div>\n    <div class="table-cell" ng-show="!arguments.network_cumul && arguments.network_sum">Rx+Tx/s</div>\n\n    <div class="table-cell" ng-show="arguments.network_cumul && !arguments.network_sum">Rx</div>\n    <div class="table-cell" ng-show="arguments.network_cumul && !arguments.network_sum">Tx</div>\n\n    <div class="table-cell" ng-show="arguments.network_cumul && arguments.network_sum"></div>\n    <div class="table-cell" ng-show="arguments.network_cumul && arguments.network_sum">Rx+Tx</div>\n</div>\n<div class="table-row" ng-repeat="network in statsNetwork.networks | orderBy: \'interfaceName\'">\n    <div class="table-cell text-left">{{ network.interfaceName | min_size }}</div>\n    <div class="table-cell" ng-show="!arguments.network_cumul && !arguments.network_sum">{{ arguments.byte ? (network.rx / network.time_since_update | bytes) : (network.rx / network.time_since_update | bits) }}</div>\n    <div class="table-cell" ng-show="!arguments.network_cumul && !arguments.network_sum">{{ 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="!arguments.network_cumul && arguments.network_sum"></div>\n    <div class="table-cell" ng-show="!arguments.network_cumul && arguments.network_sum">{{ 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="arguments.network_cumul && !arguments.network_sum">{{ arguments.byte ? (network.cumulativeRx | bytes) : (network.cumulativeRx | bits) }}</div>\n    <div class="table-cell" ng-show="arguments.network_cumul && !arguments.network_sum">{{ arguments.byte ? (network.cumulativeTx | bytes) : (network.cumulativeTx | bits) }}</div>\n\n    <div class="table-cell" ng-show="arguments.network_cumul && arguments.network_sum"></div>\n    <div class="table-cell" ng-show="arguments.network_cumul && arguments.network_sum">{{ arguments.byte ? (network.cumulativeCx | bytes) : (network.cumulativeCx | bits) }}</div>\n</div>\n');
 $templateCache.put('plugins/per_cpu.html','<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 statsPerCpu.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 statsPerCpu.cpus" ng-class="statsPerCpu.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 statsPerCpu.cpus" ng-class="statsPerCpu.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 statsPerCpu.cpus">{{ percpu.idle }}%</div>\n    </div>\n    <div class="table-row" ng-show="statsPerCpu.cpus[0].iowait">\n        <div class="table-cell text-left">iowait:</div>\n        <div class="table-cell" ng-repeat="percpu in statsPerCpu.cpus" ng-class="statsPerCpu.getSystemAlert(percpu)">\n            {{ percpu.iowait }}%\n        </div>\n    </div>\n    <div class="table-row" ng-show="statsPerCpu.cpus[0].steal">\n        <div class="table-cell text-left">steal:</div>\n        <div class="table-cell" ng-repeat="percpu in statsPerCpu.cpus" ng-class="statsPerCpu.getSystemAlert(percpu)">\n            {{ percpu.steal }}%\n        </div>\n    </div>\n</div>\n');