diff --git a/src/views/app.html b/src/views/app.html
index c9baa734a..ffc8315c0 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -824,6 +824,8 @@
             </div>
             <br/>
             <br/>
+            <label>CPU Usage</label>
+            <canvas id="graphsCPUUsageChart" style="width: 100%;"></canvas>
             <label>Memory Usage</label>
             <canvas id="graphsMemoryChart" style="width: 100%;"></canvas>
             <label>Disk Usage</label>
diff --git a/src/views/app.js b/src/views/app.js
index ba9b7f4c2..e8f28f515 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -656,9 +656,9 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             }
 
             var memoryQuery = 'summarize(collectd.localhost.table-' + appId + '-memory.gauge-rss, "' + timeBucketSize + 'min", "avg")';
-            var diskQuery = 'absolute(collectd.localhost.du-' + appId + '.capacity-usage)';
+            var diskQuery = 'summarize(collectd.localhost.du-' + appId + '.capacity-usage, "' + timeBucketSize + 'min", "avg")';
 
-            Client.graphs([memoryQuery, diskQuery], '-' + timePeriod + 'min', {}, function (error, result) {
+            Client.graphs([ memoryQuery, diskQuery ], '-' + timePeriod + 'min', {}, function (error, result) {
                 if (error) return console.error(error);
 
                 fillGraph('#graphsMemoryChart', result[0], 'Memory', 'memoryChart');