diff --git a/src/views/system.html b/src/views/system.html
index b71b13f7b..128564432 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -107,9 +107,10 @@
             <table class="table table-hover">
               <thead>
                 <tr>
-                  <th style="width: 0.5%;"></th>
-                  <th style="width:45%">Addon</th>
-                  <th style="width:49.5%">Memory</th>
+                  <th style="width: 5%;"></th>
+                  <th style="width: 20%">Addon</th>
+                  <th style="width: 50%">Memory Usage</th>
+                  <th style="width: 20%" class="text-center">Memory Limit</th>
                   <th style="width: 5%" class="text-right">Actions</th>
                 </tr>
               </thead>
@@ -123,11 +124,15 @@
                     {{ addon.name }}
                   </td>
                   <td class="elide-table-cell">
-                    <span ng-show="addon.config.memory">{{ addon.config.memory / 1024 / 1024 + 'MB' }}</span>
-                    <span ng-hide="addon.config.memory" class="text-muted">not configurable</span>
+                    <div class="progress progress-striped">
+                      <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ addon.memoryPercent }}%"></div>
+                    </div>
+                  </td>
+                  <td class="elide-table-cell text-center">
+                    <span ng-show="addon.config.memory">{{ addon.config.memory / 1024 / 1024 + ' MB' }}</span>
                   </td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
-                    <button class="btn btn-xs btn-default" ng-click="addonConfigure.show(addon)" uib-tooltip="Configure" ng-show="addon.config.memory"><i class="fa fa-pencil-alt"></i></button>
+                    <button class="btn btn-xs btn-default" ng-click="addonConfigure.show(addon)" uib-tooltip="Configure Memory Limit" ng-show="addon.config.memory"><i class="fa fa-pencil-alt"></i></button>
                     <a class="btn btn-xs btn-default" ng-href="{{ '/logs.html?id=' + addon.name }}" target="_blank" uib-tooltip="Logs"><i class="fa fa-file-alt"></i></a>
                     <button class="btn btn-xs btn-default" ng-click="restartAddon(addon.name)" uib-tooltip="Restart"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': addon.status === 'starting' }"></i></button>
                   </td>