diff --git a/src/js/index.js b/src/js/index.js
index 52ce12e0e..1c5d0200c 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -295,11 +295,12 @@ app.filter('prettyMailSize', function () {
         return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; };
 });
 
+// df -H style (si) output
 app.filter('prettyDiskSize', function () {
     return function (size) {
         if (!size) return 'Not available yet';
-        var i = Math.floor(Math.log(size) / Math.log(1024));
-        return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; };
+        var i = Math.floor(Math.log(size) / Math.log(1000));
+        return (size / Math.pow(1000, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; };
 });
 
 app.filter('installationActive', function () {
diff --git a/src/views/system.html b/src/views/system.html
index 00a228554..1fc5e8691 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -78,7 +78,7 @@
     </div>
     <div class="row" ng-repeat="disk in disks" style="margin-bottom: 20px;">
       <div class="col-md-12">
-        <h3>{{ disk.filesystem }} <small>mounted at</small> {{ disk.mountpoint }} <span class="pull-right small"><b>{{ disk.available | prettyDiskSize }}</b> of <b>{{ disk.size | prettyDiskSize }}</b> still available</span></h3>
+        <h3>{{ disk.filesystem }} <small>mounted at</small> {{ disk.mountpoint }} <span class="pull-right small"><b>{{ disk.available | prettyDiskSize }}</b> of <b>{{ disk.size | prettyDiskSize }}</b> available</span></h3>
         <div class="progress">
           <div class="progress-bar" ng-repeat="content in disk.contains" style="width: {{ content.usage / disk.size * 100 }}%; background-color: {{ content.color }};" uib-tooltip="{{ content.label + ' ' + (content.usage | prettyDiskSize) }}"></div>
         </div>
diff --git a/src/views/system.js b/src/views/system.js
index 9a969cef6..74abac110 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -175,7 +175,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
                 });
             });
 
-            $scope.disks = result.disks;
+            $scope.disks = result.disks; // [ { filesystem, type, size, used, available, capacity, mountpoint }]
 
             // lazy fetch graphite data
             $scope.disks.forEach(function (disk) {
@@ -221,7 +221,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
                             usageOther -= tmp;
                         });
 
-                        // add content container for other non tracked data
+                        // add content container for other non tracked data.
                         disk.contains.push({
                             label: 'Ubuntu',
                             id: 'other',