diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 4855d04ad6..99e59f22e8 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -80,7 +80,6 @@ import 'build/src/app/units/states/edit/directives/unit-details-editor/unit-deta
 import 'build/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.js';
 import 'build/src/app/units/states/edit/directives/directives.js';
 import 'build/src/app/units/states/edit/edit.js';
-import 'build/src/app/units/states/index/index.js';
 import 'build/src/app/units/states/students-list/students-list.js';
 import 'build/src/app/units/states/analytics/analytics.js';
 import 'build/src/app/common/filters/filters.js';
diff --git a/src/app/units/states/index/index.coffee b/src/app/units/states/index/index.coffee
deleted file mode 100644
index 69b9888ea5..0000000000
--- a/src/app/units/states/index/index.coffee
+++ /dev/null
@@ -1,50 +0,0 @@
-angular.module('doubtfire.units.states.index', [])
-
-#
-# Root state for units
-#
-.config(($stateProvider) ->
-  $stateProvider.state 'units/index', {
-    url: "/units/:unitId"
-    abstract: true
-    views:
-      main:
-        controller: "UnitsIndexStateCtrl"
-        templateUrl: "units/states/index/index.tpl.html"
-    data:
-      pageTitle: "_Home_"
-      roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
-  }
-)
-
-.controller("UnitsIndexStateCtrl", ($scope, $rootScope, $state, $stateParams, newUnitService, newProjectService, listenerService, globalStateService, newUserService, alertService) ->
-  # Error - required unitId is missing!
-  unitId = +$stateParams.unitId
-  return $state.go('home') unless unitId
-
-  globalStateService.onLoad () ->
-    # Load assessing unit role
-    $scope.unitRole = globalStateService.loadedUnitRoles.currentValues.find((unitRole) -> unitRole.unit.id == unitId)
-
-    if (! $scope.unitRole?) && ( newUserService.currentUser.role == "Admin" || newUserService.currentUser.role == "Auditor" )
-      $scope.unitRole = newUserService.adminOrAuditorRoleFor(newUserService.currentUser.role, unitId, newUserService.currentUser)
-
-    # Go home if no unit role was found
-    return $state.go('home') unless $scope.unitRole?
-
-    globalStateService.setView("UNIT", $scope.unitRole)
-
-    newUnitService.get(unitId).subscribe({
-      next: (unit)->
-        newProjectService.loadStudents(unit).subscribe({
-          next: (students)->
-            $scope.unit = unit
-          error: (err)->
-            alertService.error( "Error loading students: " + err, 8000)
-            setTimeout((()-> $state.go('home')), 5000)
-        })
-      error: (err)->
-        alertService.error( "Error loading unit: " + err, 8000)
-        setTimeout((()-> $state.go('home')), 5000)
-    })
-)
diff --git a/src/app/units/states/index/index.tpl.html b/src/app/units/states/index/index.tpl.html
deleted file mode 100644
index 795574f613..0000000000
--- a/src/app/units/states/index/index.tpl.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div ng-hide="unit && (unitRole || project)" class="large-notice-block">
-  <i class="fa fa-2x fa-spinner fa-pulse"></i>
-  <p>Loading unit details...</p>
-</div><!--/loading-->
-<div ng-if="unit && (unitRole || project)">
-  <ui-view/>
-</div>
diff --git a/src/app/units/states/states.coffee b/src/app/units/states/states.coffee
index 6860c0f2a0..4e41814d1a 100644
--- a/src/app/units/states/states.coffee
+++ b/src/app/units/states/states.coffee
@@ -1,6 +1,5 @@
 angular.module('doubtfire.units.states', [
   # 'doubtfire.units.states.all'
-  'doubtfire.units.states.index'
   'doubtfire.units.states.edit'
   'doubtfire.units.states.tasks'
   'doubtfire.units.states.groups'
diff --git a/src/app/units/task-viewer/task-viewer-state.component.ts b/src/app/units/task-viewer/task-viewer-state.component.ts
index 08fdcf38a6..9d857b01e5 100644
--- a/src/app/units/task-viewer/task-viewer-state.component.ts
+++ b/src/app/units/task-viewer/task-viewer-state.component.ts
@@ -36,7 +36,7 @@ export class TaskViewerStateComponent {
 export const TaskViewerState: NgHybridStateDeclaration = {
   name: 'units2/tasks',
   url: '/tasks/:taskDefId',
-  parent: 'unit-root-state',
+  parent: 'units/index',
   data: {
     pageTitle: 'Unit Tasks',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
diff --git a/src/app/units/unit-root-state.component.html b/src/app/units/unit-root-state.component.html
index 7261f3fdc6..d90f3bdbd1 100644
--- a/src/app/units/unit-root-state.component.html
+++ b/src/app/units/unit-root-state.component.html
@@ -1 +1,8 @@
-<div ui-view="unitView"></div>
+<div *ngIf="!(unit$ | async) || !(unitRole$ | async)" class="large-notice-block">
+  <i class="fa fa-2x fa-spinner fa-pulse"></i>
+  <p>Loading unit details...</p>
+</div>
+
+<div *ngIf="(unit$ | async) && (unitRole$ | async)">
+  <ui-view></ui-view>
+</div>
diff --git a/src/app/units/unit-root-state.component.ts b/src/app/units/unit-root-state.component.ts
index cd239a61a5..2082878446 100644
--- a/src/app/units/unit-root-state.component.ts
+++ b/src/app/units/unit-root-state.component.ts
@@ -1,90 +1,131 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {CdkDragEnd, CdkDragMove, CdkDragStart} from '@angular/cdk/drag-drop';
-import {Component, Input, OnInit} from '@angular/core';
-import {
-  BehaviorSubject,
-  Observable,
-  Subject,
-  auditTime,
-  first,
-  merge,
-  of,
-  tap,
-  withLatestFrom,
-} from 'rxjs';
-import {Unit, UnitService, UserService} from 'src/app/api/models/doubtfire-model';
-import { AppInjector } from '../app-injector';
-import { NgHybridStateDeclaration } from '@uirouter/angular-hybrid';
-import { GlobalStateService, ViewType } from '../projects/states/index/global-state.service';
-import { StateService } from '@uirouter/core';
-import { AlertService } from '../common/services/alert.service';
+import {Component, Input, OnInit, OnDestroy} from '@angular/core';
+import {Observable, Subscription} from 'rxjs';
+import {Unit, UnitRole} from 'src/app/api/models/doubtfire-model';
+import {AppInjector} from '../app-injector';
+import {NgHybridStateDeclaration} from '@uirouter/angular-hybrid';
+import {Ng2ViewDeclaration} from '@uirouter/angular';
+import {GlobalStateService, ViewType} from '../projects/states/index/global-state.service';
+import {StateService} from '@uirouter/core';
+import {AlertService} from '../common/services/alert.service';
+import {UnitService} from '../api/services/unit.service';
+import {UserService} from '../api/services/user.service';
+import {first} from 'rxjs/operators';
 
 @Component({
   selector: 'f-unit-root-state',
   templateUrl: './unit-root-state.component.html',
   styleUrl: './unit-root-state.component.css',
 })
-export class UnitRootStateComponent {
+export class UnitRootStateComponent implements OnInit, OnDestroy {
   @Input() public unit$: Observable<Unit>;
+  @Input() public unitRole$: Observable<UnitRole>;
+
+  public unit: Unit;
+  public unitRole: UnitRole;
+
+  private subscriptions: Subscription[] = [];
+
+  ngOnInit(): void {
+    // Subscribe to observables and store values for Angular template
+    if (this.unit$) {
+      const unitSub = this.unit$.subscribe((unit) => {
+        this.unit = unit;
+      });
+      this.subscriptions.push(unitSub);
+    }
+
+    if (this.unitRole$) {
+      const roleSub = this.unitRole$.subscribe((unitRole) => {
+        this.unitRole = unitRole;
+      });
+      this.subscriptions.push(roleSub);
+    }
+  }
+
+  ngOnDestroy(): void {
+    // Clean up subscriptions
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+  }
 }
 
 export const UnitRootState: NgHybridStateDeclaration = {
-  name: 'unit-root-state',
-  url: '/units2/:unitId',
+  name: 'units/index',
+  url: '/units/:unitId',
   abstract: true,
   data: {
-    pageTitle: 'Unit Root State',
+    pageTitle: '_Home_',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
   views: {
     main: {
-      component: UnitRootStateComponent,
-    },
+      controller: function($scope, unit$, unitRole$) {
+        // Set observables on $scope for template binding to Angular component
+        $scope.unit$ = unit$;
+        $scope.unitRole$ = unitRole$;
+
+        // Subscribe and set values on $scope for AngularJS child states
+        unit$.subscribe((unit) => {
+          $scope.unit = unit;
+        });
+        unitRole$.subscribe((unitRole) => {
+          $scope.unitRole = unitRole;
+        });
+      },
+      template: '<f-unit-root-state [unit$]="unit$" [unitRole$]="unitRole$"></f-unit-root-state>',
+    } as unknown as Ng2ViewDeclaration,
   },
+
   resolve: {
     unit$: function ($stateParams) {
       const unitService = AppInjector.get(UnitService);
+      const stateService = AppInjector.get(StateService);
+      const alertService = AppInjector.get(AlertService);
+
+      const unitId = parseInt($stateParams.unitId);
+      if (!unitId) {
+        stateService.go('home');
+        return;
+      }
+
+      return unitService.get(unitId).pipe(
+        first()
+      );
+    },
+    unitRole$: function ($stateParams, unit$) {
       const globalState = AppInjector.get(GlobalStateService);
       const userService = AppInjector.get(UserService);
       const stateService = AppInjector.get(StateService);
+      const alertService = AppInjector.get(AlertService);
 
-      return new Observable<Unit>((observer) => {
+      return new Observable<UnitRole>((observer) => {
         globalState.onLoad(() => {
-          const unitId: number = parseInt($stateParams.unitId);
-          let unitRole = globalState.loadedUnitRoles.currentValues.find(
-            (unitRole) => unitRole.unit.id === unitId,
+          const unitId = parseInt($stateParams.unitId);
+
+          let role = globalState.loadedUnitRoles.currentValues.find(
+            (ur) => ur.unit.id === unitId
           );
 
-          if (
-            !unitRole &&
-            (userService.currentUser.role == 'Admin' || userService.currentUser.role == 'Auditor')
-          ) {
-            unitRole = userService.adminOrAuditorRoleFor(
+          if (!role && (userService.currentUser.role === 'Admin' || userService.currentUser.role === 'Auditor')) {
+            role = userService.adminOrAuditorRoleFor(
               userService.currentUser.role,
               unitId,
-              userService.currentUser,
+              userService.currentUser
             );
           }
 
-          // Go home if no unit role was found
-          if (!unitRole) {
-            console.log('No unit role found for unit', unitId);
-            return stateService.go('home');
+          if (!role) {
+            alertService.error('You do not have access to this unit', 6000);
+            stateService.go('home');
+            observer.complete();
+            return;
           }
 
-          unitService.get(unitId).subscribe({
-            next: (unit: Unit) => {
-              observer.next(unit);
-              globalState.setView(ViewType.UNIT, unitRole);
-              observer.complete();
-            },
-            error: (err) => {
-              AppInjector.get(AlertService).error('Error loading unit: ' + err, 8000);
-              setTimeout(() => stateService.go('home'), 5000);
-            }
-          });
+          globalState.setView(ViewType.UNIT, role);
+          observer.next(role);
+          observer.complete();
         });
       }).pipe(first());
     },
   },
-};
+};
\ No newline at end of file