diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
index 8a12aadfd0446dfc3293617907611eac767bebba..0ad8206a91c41d8b5cece631bbce43d4823eb44b 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
@@ -179,6 +179,10 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS
                             movable: $.inArray(task.status_id, editableTaskStatusIds) > -1
                         };
 
+                        if(task.id == dataService.selected_task_id) {
+                            rowTask.classes = 'task-selected-task';
+                        }
+
                         if(task.predecessor_ids && task.predecessor_ids.length > 0) {
                             rowTask['dependencies'] = [];
                             for(var predId of task.predecessor_ids) {
@@ -202,6 +206,7 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS
     };
 
     $scope.$watch('dataService.initialLoadComplete', updateGanttData);
+    $scope.$watch('dataService.selected_task_id', updateGanttData);
     $scope.$watch('dataService.tasks', updateGanttData, true);
     $scope.$watch('dataService.resources', updateGanttData);
     $scope.$watch('dataService.resourceClaims', updateGanttData, true);
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
index 041925a773e8ce51b6d174c0e068611c1996fbbf..d110fd5ec6d25aa79a768003e44013c1cc2fdcb9 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
@@ -280,6 +280,13 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
                         movable: $.inArray(task.status_id, editableTaskStatusIds) > -1
                     };
 
+
+                    if(claim.id == dataService.selected_resourceClaim_id) {
+                        claimTask.classes += ' claim-selected-claim';
+                    } else if(task.id == dataService.selected_task_id) {
+                        claimTask.classes += ' claim-selected-task';
+                    }
+
                     ganttRow.tasks.push(claimTask);
                 }
             }
@@ -364,6 +371,10 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
                                 movable: $.inArray(task.status_id, editableTaskStatusIds) > -1
                             };
 
+                            if(task.id == dataService.selected_task_id) {
+                                claimTask.classes += ' claim-selected-task';
+                            }
+
                             ganttRow.tasks.push(claimTask);
                         }
                     }
@@ -401,11 +412,13 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
     };
 
     $scope.$watch('dataService.initialLoadComplete', updateGanttData);
+    $scope.$watch('dataService.selected_task_id', updateGanttData);
+    $scope.$watch('dataService.tasks', updateGanttData, true);
     $scope.$watch('dataService.resources', updateGanttData);
     $scope.$watch('dataService.resourceClaims', updateGanttData, true);
     $scope.$watch('dataService.resourceGroups', updateGanttData);
     $scope.$watch('dataService.resourceGroupMemberships', updateGanttData);
-    $scope.$watch('dataService.filteredTaskDict', updateGanttData, true);
+    $scope.$watch('dataService.filteredTaskDict', updateGanttData);
     $scope.$watch('dataService.lofarTime', function() {$scope.options.currentDateValue= $scope.dataService.lofarTime;});
 }
 ]);
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
index c6413855e942774a0c4d278d0660b168a08a066e..ad104768eeb2be6918f08fc1f91c8e12a341990b 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
@@ -34,9 +34,8 @@
 }
 
 .gantt-current-date-line {
-    border: 3px solid #222222;
-    opacity: 0.7;
-    z-index: 100000;
+    border: 2px solid #000000;
+    z-index: 0;
 }
 
 .gantt-side {
@@ -47,19 +46,39 @@
     top: 20px;
 }
 
+.gantt-task.selected-task {
+  border: 1px solid #000000;
+  border-radius: 2px;
+}
+
+.gantt-task.claim-selected-task {
+  border: 1px solid #555555;
+  border-radius: 2px;
+}
+
+.gantt-task.claim-selected-claim {
+  border: 2px solid #000000;
+  border-radius: 2px;
+}
+
 .gantt-task.claim-status-claimed {
   border-bottom: 5px solid #ffa64d;
+  border-radius: 2px;
 }
 
 .gantt-task.claim-status-conflict {
   border-bottom: 5px solid #ff0000;
+  border-radius: 2px;
 }
 
 .gantt-task.claim-status-allocated {
   border-bottom: 5px solid #66ff66;
+  border-radius: 2px;
 }
 
 .gantt-task.claim-status-mixed {
   border-bottom: 5px solid #bfbfbf;
+  border-radius: 2px;
 }
 
+