diff --git a/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.html b/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.html
index dbd2a0752..8ce3205f3 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.html
@@ -50,9 +50,11 @@
                                             icon="iqser:trash"
                                         ></iqser-circle-button>
                                     }
-                                    @if (selectedComponent?.id === component.id) {
-                                        <mat-icon class="arrow-right" svgIcon="red:arrow-right"></mat-icon>
-                                    }
+                                    <mat-icon
+                                        [class.not-visible]="selectedComponent?.id !== component.id"
+                                        class="arrow-right"
+                                        svgIcon="red:arrow-right"
+                                    ></mat-icon>
                                 </div>
                             </div>
                         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.scss b/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.scss
index 54a237251..85a10cd48 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/component-definitions/component-definitions.component.scss
@@ -38,6 +38,10 @@
 
         .arrow-right {
             transform: scale(0.7);
+
+            &.not-visible {
+                visibility: hidden;
+            }
         }
     }
 }
@@ -45,6 +49,8 @@
 .content-container {
     background-color: var(--iqser-grey-6);
     height: 100vh;
+    display: flex;
+    flex-direction: column;
 
     .content-header {
         display: flex;
@@ -61,6 +67,7 @@
     }
 
     .content {
+        flex: 1;
         display: flex;
         gap: 20px;
         overflow: hidden;
@@ -68,7 +75,8 @@
         .components-list {
             flex: 1;
             background-color: var(--iqser-white);
-            width: 100%;
+            display: flex;
+            flex-direction: column;
 
             .header {
                 height: 30px;
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html
index 2013a2410..5f33edd9e 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html
@@ -27,7 +27,7 @@
                 <mat-form-field>
                     <mat-select formControlName="dictionary">
                         <mat-select-trigger>{{ displayedDictionaryLabel }}</mat-select-trigger>
-                        <mat-option [value]="entity.type">
+                        <mat-option [value]="entity?.type">
                             <span> {{ redaction.typeLabel }} </span>
                         </mat-option>
                     </mat-select>
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 5288362b8..2546845f5 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -2046,6 +2046,7 @@
       "auto-expand-filters-on-action": "Filter ausgehend von meinen Aktionen automatisch anpassen",
       "help-mode-dialog": "Dialog zur Aktivierung des Hilfemodus",
       "load-all-annotations-warning": "Warnung bei gleichzeitigem Laden aller Annotationen in der Miniaturansicht",
+      "overwrite-file-option": "Preferred action when re-uploading of an already existing file",
       "table-extraction-type": "Art der Tabellenextraktion"
     },
     "label": "Präferenzen",
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 07433cfe7..4a17833bd 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -1556,7 +1556,7 @@
         "select-none": "None",
         "show-skipped": "Show skipped in document",
         "the-filters": "the filters",
-        "wrong-filters": "The selected filter combination is not possible. Please adjust or"
+        "wrong-filters": "No annotations for the selected filter combination. Please adjust or"
       },
       "document-info": {
         "close": "Close document info",
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 3c6b018cc..5475858db 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -1548,7 +1548,7 @@
         "jump-to-next": "Springe zu Nächster",
         "jump-to-previous": "Springe zu Vorheriger",
         "label": "Arbeitsvorrat",
-        "no-annotations": "There are no annotations on the selected page or for the selected component.",
+        "no-annotations": "There are no annotations for the selected component. \n",
         "page-is": "Diese Seite ist",
         "reset": "reset",
         "select": "Auswählen",
@@ -1556,7 +1556,7 @@
         "select-none": "Keine",
         "show-skipped": "Show skipped in document",
         "the-filters": "the filters",
-        "wrong-filters": "The selected filter combination is not possible. Please adjust or"
+        "wrong-filters": "No annotations for the selected filter combination. Please adjust or"
       },
       "document-info": {
         "close": "Dokumenteninformation schließen",
@@ -2046,6 +2046,7 @@
       "auto-expand-filters-on-action": "Auto expand filters on my actions",
       "help-mode-dialog": "Help Mode Dialog",
       "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview",
+      "overwrite-file-option": "Preferred action when re-uploading of an already existing file",
       "table-extraction-type": "Table extraction type"
     },
     "label": "Preferences",
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 340aea20c..2ce60e90f 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -1531,7 +1531,7 @@
     },
     "last-assignee": "Last assignee",
     "no-data": {
-      "title": "There are no annotations on this page."
+      "title": "This page does not contain annotations for the selected component or filter."
     },
     "quick-nav": {
       "jump-first": "Jump to first page",
@@ -1548,7 +1548,7 @@
         "jump-to-next": "Jump to next",
         "jump-to-previous": "Jump to previous",
         "label": "Workload",
-        "no-annotations": "There are no annotations on the selected page or for the selected component.",
+        "no-annotations": "There are no annotations for the selected component. \n",
         "page-is": "This page is",
         "reset": "reset",
         "select": "Select",
@@ -1556,7 +1556,7 @@
         "select-none": "None",
         "show-skipped": "Show skipped in document",
         "the-filters": "the filters",
-        "wrong-filters": "The selected filter combination is not possible. Please adjust or"
+        "wrong-filters": "No annotations for the selected filter combination. Please adjust or"
       },
       "document-info": {
         "close": "Close document info",