diff --git a/src/translation/en.json b/src/translation/en.json
index eda48da40..28d9a6043 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -915,11 +915,12 @@
             "mountedAt": "{{ filesystem }} <small>mounted at</small> {{ mountpoint }}",
             "usageInfo": "{{ available | prettyDiskSize }}</b> of <b>{{ size | prettyDiskSize }}</b> available",
             "diskContent": "This {{ type }} disk contains",
-            "notAvailableYet": "Not available yet"
+            "notAvailableYet": "Not available yet",
+            "usedInfo": "{{ used }} used of {{ size }}"
         },
         "systemMemory": {
             "title": "System Memory",
-            "graphSubtext": "App values are not stacked up"
+            "graphSubtext": "Only apps using more than 1GB of memory are shown"
         },
         "cpuUsage": {
             "title": "CPU Usage",
diff --git a/src/views/system.html b/src/views/system.html
index 7cf1d5aa9..953afe300 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -27,8 +27,9 @@
           <div class="row" ng-repeat="disk in disks.disks" style="margin-bottom: 20px;">
             <div class="col-md-12">
               <h3>
+                <!-- <span>{{ disk.filesystem }}</span>  <span>({{ disk.mountpoint }})</span> -->
                 <span ng-bind-html="'system.diskUsage.mountedAt' | tr:{ filesystem: disk.filesystem, mountpoint: disk.mountpoint }"></span>
-                <span class="pull-right small" ng-show="disk.available && disk.size" ng-bind-html="'system.diskUsage.usageInfo' | tr:{ available: disk.available, size: disk.size }"></span>
+                <span class="pull-right small" ng-show="disk.available && disk.size" ng-bind-html="'system.diskUsage.usedInfo' | tr:{ used: ((disk.size - disk.available) | prettyDiskSize), size: (disk.size | prettyDiskSize) }"></span>
                 <span class="pull-right small" ng-hide="disk.available && disk.size">{{ 'system.diskUsage.notAvailableYet' | tr }}</span>
               </h3>
               <div class="progress">
@@ -53,7 +54,8 @@
       <div class="card card-large" style="min-height: 300px;">
         <label style="display: block">Megabyte <span class="pull-right">RAM ({{ memory.memory | prettyByteSize }}) + Swap ({{ memory.swap | prettyByteSize }})</span></label>
         <canvas id="graphsSystemMemoryChart" style="width: 100%;"></canvas>
-        {{ 'system.systemMemory.graphSubtext' | tr }}
+        <br/>
+        <div class="text-muted text-center text-small">{{ 'system.systemMemory.graphSubtext' | tr }}</div>
       </div>
     </uib-tab>
 
diff --git a/src/views/system.js b/src/views/system.js
index 0612181e9..5c3a62e0e 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -169,7 +169,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             var timePeriod = $scope.graphs.period * 60;
             var timeBucketSize = $scope.graphs.period > 24 ? (6*60) : 5;
 
-            function fillGraph(canvasId, data, additionalData, label, chartPropertyName, max, valueDivider) {
+            function fillGraph(canvasId, data, appsData, label, chartPropertyName, max, valueDivider) {
                 // translate the data from bytes to MB
                 var datapoints = data.datapoints.map(function (d) { return parseInt((d[0] / valueDivider).toFixed(2)); });
                 var labels = datapoints.map(function (d, index) {
@@ -191,8 +191,10 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
                     data: datapoints
                 }];
 
-                if (Array.isArray(additionalData)) {
-                    additionalData.forEach(function (data, index) {
+                if (Array.isArray(appsData)) {
+                    appsData.forEach(function (data, index) {
+                        if (!data.datapoints.some(function (p) { return p[0] > 1024*1024*1024; })) return;
+
                         datasets.push({
                             label: apps[index].fqdn,
                             fill: false,