Index: trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml
===================================================================
--- trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml	(revision 12521)
+++ trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml	(revision 12546)
@@ -80,13 +80,13 @@
                     <tr data-toggle="tooltip" data-placement="bottom" title="All online slaves">
                         <td class="text-left">Total:</td>
-                        <td class="text-right">{{status.MemoryStatus.TotalMemory | toGB}}</td>
+                        <td class="text-right">{{status.MemoryStatus.TotalMemory | kbToGB}} GB</td>
                     </tr>
                     <tr data-toggle="tooltip" data-placement="bottom" title="All calculating and idle slaves that are allowed to calculate">
                         <td class="text-left">Active:</td>
-                        <td class="text-right">{{status.MemoryStatus.ActiveMemory | toGB}}</td>
+                        <td class="text-right">{{status.MemoryStatus.ActiveMemory | kbToGB}} GB</td>
                     </tr>
                     <tr data-toggle="tooltip" data-placement="bottom" title="All calculating slaves that are allowed to calculate">
                         <td class="text-left">Calculating:</td>
-                        <td class="text-right">{{status.MemoryStatus.UsedMemory | toGB}}</td>
+                        <td class="text-right">{{status.MemoryStatus.UsedMemory | kbToGB}} GB</td>
                     </tr>
                 </table>
@@ -233,6 +233,6 @@
                             <td>{{slave.Slave.Name}}</td>
                             <td>{{slave.CpuUtilization | number: 2}} %</td>
-                            <td>{{slave.Cores | number}}</td>
-                            <td>{{slave.Memory | toGB}}</td>
+                            <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td>
+                            <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td>
                         </tr>
                         <tr ng-hide="activeCalculatingSlaves.length">
@@ -291,6 +291,6 @@
                             <td>{{slave.Slave.Name}}</td>
                             <td>{{slave.CpuUtilization | number: 2}} %</td>
-                            <td>{{slave.Cores | number}}</td>
-                            <td>{{slave.Memory | toGB}}</td>
+                            <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td>
+                            <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td>
                         </tr>
                         <tr ng-hide="activeIdleSlaves.length">
@@ -348,6 +348,6 @@
                             <td>{{slave.Slave.Name}}</td>
                             <td>{{slave.CpuUtilization | number: 2}} %</td>
-                            <td>{{slave.Cores | number}}</td>
-                            <td>{{slave.Memory | toGB}}</td>
+                            <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td>
+                            <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td>
                         </tr>
                         <tr ng-hide="inactiveSlaves.length">
Index: trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
===================================================================
--- trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js	(revision 12521)
+++ trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js	(revision 12546)
@@ -202,12 +202,3 @@
         }]
     );
-
-    module.filter('toGB', function () {
-        return function (text, length, end) {
-            if (text == null || text == '') text = '0';
-            text = Math.round(parseInt(text) / 1024);
-            return text + ' GB';
-        };
-    });
-
 })();
