diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
index dc7c5b5db..a379400af 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
@@ -1,9 +1,6 @@
 <div *ngIf="screen === 'dossier-overview'" [class.active]="actionMenuOpen" class="action-buttons">
     <ng-container *ngTemplateOutlet="actions"></ng-container>
-    <redaction-status-bar
-        *ngIf="fileStatus.isWorkable"
-        [config]="statusBarConfig"
-    ></redaction-status-bar>
+    <redaction-status-bar *ngIf="fileStatus?.isWorkable" [config]="statusBarConfig"></redaction-status-bar>
 </div>
 
 <ng-container *ngIf="screen === 'file-preview'">
@@ -11,7 +8,7 @@
 </ng-container>
 
 <ng-template #actions>
-    <div class="file-actions">
+    <div class="file-actions" *ngIf="fileStatus">
         <!-- delete-->
         <redaction-circle-button
             (action)="openDeleteFileDialog($event)"
@@ -94,11 +91,7 @@
             *ngIf="permissionsService.isReadyForApproval(fileStatus)"
             [disabled]="!permissionsService.canApprove(fileStatus)"
             [tooltipPosition]="tooltipPosition"
-            [tooltip]="
-                permissionsService.canApprove(fileStatus)
-                    ? 'dossier-overview.approve'
-                    : 'dossier-overview.approve-disabled'
-            "
+            [tooltip]="permissionsService.canApprove(fileStatus) ? 'dossier-overview.approve' : 'dossier-overview.approve-disabled'"
             [type]="buttonType"
             icon="red:approved"
         ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
index 29cd7505d..35627cdd2 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
@@ -133,7 +133,11 @@
                         <redaction-empty-state [horizontalPadding]="24" [verticalPadding]="40" icon="red:document" screen="file-preview">
                             <ng-container *ngIf="fileData?.fileStatus?.excludedPages?.includes(activeViewerPage)">
                                 {{ 'file-preview.tabs.annotations.page-is' | translate }}
-                                <a (click)="actionPerformed.emit('view-exclude-pages')" translate="file-preview.excluded-from-redaction">
+                                <a
+                                    (click)="actionPerformed.emit('view-exclude-pages')"
+                                    class="with-underline"
+                                    translate="file-preview.excluded-from-redaction"
+                                >
                                 </a
                                 >.
                             </ng-container>
diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts
index 10ca5e383..5c9fbf827 100644
--- a/apps/red-ui/src/app/services/router-history.service.ts
+++ b/apps/red-ui/src/app/services/router-history.service.ts
@@ -9,13 +9,11 @@ export class RouterHistoryService {
     private _lastDossiersScreen = '/main/dossiers';
 
     constructor(private readonly _router: Router) {
-        this._router.events
-            .pipe(filter(event => event instanceof NavigationEnd))
-            .subscribe((event: NavigationEnd) => {
-                if (event.url.startsWith('/main/dossiers')) {
-                    this._lastDossiersScreen = event.url;
-                }
-            });
+        this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
+            if (event.url.startsWith('/main/dossiers')) {
+                this._lastDossiersScreen = event.url;
+            }
+        });
     }
 
     navigateToLastDossiersScreen() {
diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss
index 9e72c84fd..b80aa2226 100644
--- a/apps/red-ui/src/assets/styles/red-text-styles.scss
+++ b/apps/red-ui/src/assets/styles/red-text-styles.scss
@@ -9,6 +9,12 @@ a {
         color: lighten($primary, 10%);
     }
 
+    &.with-underline {
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+
     cursor: pointer;
 }