diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/app.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/app.js
index 537d013649ee926c9f7cf0ff30ded34d323ae3b8..07dd886ee459f569a87b5b3dcb7a0dfa6cc6f852 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/app.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/app.js
@@ -2,7 +2,6 @@
 
 var app = angular.module('raeApp',
                          ['ngTouch',
-                         'ui.grid',
                          'gantt',
                          'gantt.table',
                          'gantt.movable',
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
index 68cbe5b07af59d8cfa1257973b86cee4f210184e..eb92c7de1742a11d9a05f2d97874ebad9209f782 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
@@ -1,14 +1,27 @@
 // $Id: controller.js 32761 2015-11-02 11:50:21Z schaap $
 
-var gridControllerMod = angular.module('GridControllerMod', ['DataControllerMod']);
+var gridControllerMod = angular.module('GridControllerMod', ['ui.grid', 'ui.grid.treeView']);
 
-gridControllerMod.controller('GridController', ['$scope', 'dataService', function($scope, dataService) {
+gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGridTreeViewConstants', function($scope, dataService, uiGridTreeViewConstants) {
 
     $scope.dataService = dataService;
 
     $scope.$watch('dataService.tasks', function() {
         if('tasks' in $scope.dataService && $scope.dataService.tasks.length > 0)
-            $scope.gridOptions.data = $scope.dataService.tasks[0]['tasks'];
+        {
+            var taskList = [];
+            for ( var i = 0; i < $scope.dataService.tasks.length; i++ ){
+                var node = $scope.dataService.tasks[i];
+                node.$$treeLevel = 0;
+                taskList.push(node);
+                var nodeTasks = node['tasks'];
+                for ( var j = 0; j < nodeTasks.length; j++ ){
+                    nodeTasks[j].$$treeLevel = 1;
+                    taskList.push(nodeTasks[j]);
+                }
+            }
+            $scope.gridOptions.data = taskList;
+        }
         else
             $scope.gridOptions.data = []
     }, true);
@@ -16,7 +29,9 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', functio
     $scope.columns = [{ field: 'name' }, { field: 'from' }, { field: 'to' }];
     $scope.gridOptions = {
         enableSorting: true,
+        enableFiltering: true,
         columnDefs: $scope.columns,
+        showTreeExpandNoChildren: false,
         data: []
     };
 }
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
index 8285ce40c628f22fcca9ed068d459f0420d57ea1..9f3636c498242cb8b0cce064ebb0f3dafcf3df7f 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
@@ -1,8 +1,10 @@
 /* $Id: app.js 32724 2015-10-28 13:24:49Z schaap $ */
 
 .myGrid {
-    width: 500px;
+    min-height: 400px;
+    min-width: 500px;
     height: auto;
+    width: auto;
 }
 
 .gantt {
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html
index aecbc30fd2bc8b50467f3475881d8cbd1187c0f6..6b0db5c1620fe9bd71f42b715ae176b8f66ff836 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html
@@ -26,7 +26,7 @@
     {% raw %}
     <div ng-controller="GridController as gridCtrl">
         <strong>Tasks:</strong>
-        <div id="grid1" ui-grid="gridOptions" ui-grid-move-columns class="grid"></div>
+        <div id="grid1" ui-grid="gridOptions" ui-grid-move-columns ui-grid-tree-view class="myGrid"></div>
     </div>
     <br/>
     <br/>