diff --git a/.eslintrc.json b/.eslintrc.json index 888c968b5c..6ee63b269f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -294,7 +294,8 @@ "rules": { // Custom DSpace Angular rules "dspace-angular-html/themed-component-usages": "error", - "dspace-angular-html/no-disabled-attribute-on-button": "error" + "dspace-angular-html/no-disabled-attribute-on-button": "error", + "@angular-eslint/template/prefer-control-flow": "error" } }, { diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html index 6c748ca2e7..8c2b37adbd 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html @@ -2,10 +2,10 @@
+ data-test="browse">
@@ -18,9 +18,9 @@
+ [selectable]="true" + [selectionConfig]="{ repeatable: true, listId: listId }" + [showThumbnails]="false">
@@ -36,21 +36,25 @@ [showPaginator]="false" (prev)="pagePrev()" (next)="pageNext()"> - + @if ((objectsSelected$|async)?.hasSucceeded) { + + } diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts index a400742f01..fc7e86ad4c 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, Input, @@ -59,11 +55,9 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; AsyncPipe, NgbAccordionModule, TranslateModule, - NgIf, NgbNavModule, ThemedSearchComponent, BrowserOnlyPipe, - NgForOf, NgxPaginationModule, SelectableListItemControlComponent, ListableObjectComponentLoaderComponent, diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts index 264cefc708..a8c527c755 100644 --- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts +++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts @@ -1,4 +1,4 @@ -import { NgIf } from '@angular/common'; + import { Component, ViewChild, @@ -16,7 +16,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont imports: [ NgbAccordionModule, TranslateModule, - NgIf, AccessControlFormContainerComponent, ], standalone: true, diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html index 8c462daf6b..c054a5dd55 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.html +++ b/src/app/access-control/epeople-registry/epeople-registry.component.html @@ -6,7 +6,7 @@
@@ -18,77 +18,84 @@
-
-
-
+
+
- - - + class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate" + [placeholder]="(labelPrefix + 'search.placeholder' | translate)"> + + +
+ class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}
- - - -
- - - - - - - - - - - - - - - + + } + +
{{labelPrefix + 'table.id' | translate}}{{labelPrefix + 'table.name' | translate}}{{labelPrefix + 'table.email' | translate}}{{labelPrefix + 'table.edit' | translate}}
{{epersonDto.eperson.id}}{{ dsoNameService.getName(epersonDto.eperson) }}{{epersonDto.eperson.email}} -
- + @if (epersonDto.ableToDelete) { + + } +
+
+
+ + } + + @if ((pageInfoState$ | async)?.totalElements === 0) { + - - - - + }
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts index 6b62a13ecf..1aee792aba 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts @@ -1,8 +1,6 @@ import { AsyncPipe, NgClass, - NgForOf, - NgIf, } from '@angular/common'; import { Component, @@ -72,13 +70,11 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component'; TranslateModule, RouterModule, AsyncPipe, - NgIf, EPersonFormComponent, ReactiveFormsModule, ThemedLoadingComponent, PaginationComponent, NgClass, - NgForOf, ], standalone: true, }) diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html index c6f3a915a9..9947d775a2 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html @@ -2,97 +2,111 @@
-
- - -

{{messagePrefix + '.create' | translate}}

- - - + @if (activeEPerson$ | async) {

{{messagePrefix + '.edit' | translate}}

- + } @else { +

{{messagePrefix + '.create' | translate}}

+ } + + + [formModel]="formModel" + [formGroup]="formGroup" + [formLayout]="formLayout" + [displayCancel]="false" + [submitLabel]="submitLabel" + (submitForm)="onSubmit()">
-
- +
+ } + @if (canImpersonate$ | async) { +
+ @if (!isImpersonated) { + + } + @if (isImpersonated) { + + } +
+ } + @if (canDelete$ | async) { + -
-
- - -
- + } - + @if (!formGroup) { + + } -
-

{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}

- - - - - -
- - - - - - - - - - - - - - - -
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.collectionOrCommunity' | translate}}
{{group.id}} - - {{ dsoNameService.getName(group) }} - - - {{ dsoNameService.getName((group.object | async)?.payload) }} -
-
- - - - + }
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts index c7b57c986d..8b5a8817a9 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts @@ -1,8 +1,6 @@ import { AsyncPipe, NgClass, - NgFor, - NgIf, } from '@angular/common'; import { ChangeDetectorRef, @@ -84,8 +82,6 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator'; templateUrl: './eperson-form.component.html', imports: [ FormComponent, - NgIf, - NgFor, AsyncPipe, TranslateModule, NgClass, diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html index 7e8c1ed1b4..060cc5b86d 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.html +++ b/src/app/access-control/group-registry/group-form/group-form.component.html @@ -2,13 +2,7 @@
-
- - -

{{messagePrefix + '.head.create' | translate}}

- - - + @if (activeGroup$ | async) {

+ > {{messagePrefix + '.head.edit' | translate}}

- + } @else { +

{{messagePrefix + '.head.create' | translate}}

+ } - - - - - - - + + + @if ((activeGroup$ | async); as groupBeingEdited) { + @if (groupBeingEdited?.permanent) { + + } + @if ((activeGroupLinkedDSO$ | async); as activeGroupLinkedDSO) { + @if ((canEdit$ | async) !== true) { + + + } + } + } + [formModel]="formModel" + [formGroup]="formGroup" + [formLayout]="formLayout" + [displayCancel]="false" + (submitForm)="onSubmit()">
-
-
- -
- + class="btn btn-outline-secondary"> {{messagePrefix + '.return' | translate}} +
+ @if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) { +
+ +
+ } + - -
- -
- - + @if ((activeGroup$ | async); as groupBeingEdited) { +
+ @if (groupBeingEdited !== undefined) { + + } +
+ @if (groupBeingEdited !== undefined) { + + } + } +
- diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts index d2ddb3266b..087db617e7 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -92,7 +89,6 @@ import { ValidateGroupExists } from './validators/group-exists.validator'; imports: [ FormComponent, AlertComponent, - NgIf, AsyncPipe, TranslateModule, ContextHelpDirective, diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html index 82e07a898d..44a3775c05 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html @@ -3,63 +3,70 @@

{{messagePrefix + '.headMembers' | translate}}

- + @if ((ePeopleMembersOfGroup | async)?.totalElements > 0) { + +
+ + + + + + + + + + + @for (epersonDTO of (ePeopleMembersOfGroup | async)?.page; track epersonDTO) { + + + + + + + } + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{epersonDTO.eperson.id}} + + {{ dsoNameService.getName(epersonDTO.eperson) }} + + + {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}
+ {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }} + 		+
+ @if (epersonDTO.ableToDelete) { + + } + @if (!epersonDTO.ableToDelete) { + + } +
+
+
+ + } -
- - - - - - - - - - - - - - - - - -
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{epersonDTO.eperson.id}} - - {{ dsoNameService.getName(epersonDTO.eperson) }} - - - {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}
- {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }} - 		-
- - -
-
+ @if ((ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0) { + - - - - + } @@ -78,68 +85,72 @@
+ class="form-control" aria-label="Search input"> - - + + +
-
-
- -
- +
+ +
+ - + @if ((ePeopleSearch | async)?.totalElements > 0) { + +
+ + + + + + + + + + + @for (eperson of (ePeopleSearch | async)?.page; track eperson) { + + + + + + + } + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{eperson.id}} + + {{ dsoNameService.getName(eperson) }} + + + {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}
+ {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }} + 		+
+ +
+
+
+ + } -
- - - - - - - - - - - - - - - - - -
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{eperson.id}} - - {{ dsoNameService.getName(eperson) }} - - - {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}
- {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }} - 		-
- -
-
-
+ @if ((ePeopleSearch | async)?.totalElements === 0 && searchDone) { + + } - - - - - + diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index 22934394c8..737e08427b 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -1,8 +1,6 @@ import { AsyncPipe, NgClass, - NgForOf, - NgIf, } from '@angular/common'; import { Component, @@ -109,11 +107,9 @@ export interface EPersonListActionConfig { ContextHelpDirective, ReactiveFormsModule, PaginationComponent, - NgIf, AsyncPipe, RouterLink, NgClass, - NgForOf, BtnDisabledDirective, ], standalone: true, diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html index 32525fb2b5..d09ab08c42 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html @@ -3,51 +3,56 @@

{{messagePrefix + '.headSubgroups' | translate}}

- - -
- - - - - - - - - - - - - - - + + } + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.collectionOrCommunity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{group.id}} - - {{ dsoNameService.getName(group) }} - - {{ dsoNameService.getName((group.object | async)?.payload)}} -
- +
+
+
+ + } - + @if ((subGroups$ | async)?.payload?.totalElements === 0) { + + }

{{messagePrefix + 'head' | translate}}

@@ -17,8 +17,8 @@
+ class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate" + [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
- - + @if (loading$ | async) { + + } + @if ((pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true) { + +
+ + + + + + + + + + + + @for (groupDto of (groupsDto$ | async)?.page; track groupDto) { + + + + + + + + } + +
{{messagePrefix + 'table.id' | translate}}{{messagePrefix + 'table.name' | translate}}{{messagePrefix + 'table.collectionOrCommunity' | translate}}{{messagePrefix + 'table.members' | translate}}{{messagePrefix + 'table.edit' | translate}}
{{groupDto.group.id}}{{ dsoNameService.getName(groupDto.group) }}{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}} +
+ @switch (groupDto.ableToEdit) { + @case (true) { + + } + @case (false) { + + } + } + @if (!groupDto.group?.permanent && groupDto.ableToDelete) { + + } +
+
+
+ + } -
- - - - - - - - - - - - - - - - - - - -
{{messagePrefix + 'table.id' | translate}}{{messagePrefix + 'table.name' | translate}}{{messagePrefix + 'table.collectionOrCommunity' | translate}}{{messagePrefix + 'table.members' | translate}}{{messagePrefix + 'table.edit' | translate}}
{{groupDto.group.id}}{{ dsoNameService.getName(groupDto.group) }}{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}} -
- - - - - -
-
+ @if ((pageInfoState$ | async)?.totalElements === 0) { + - - - + }
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts index 07b7317a1e..d3cf50ad4b 100644 --- a/src/app/access-control/group-registry/groups-registry.component.ts +++ b/src/app/access-control/group-registry/groups-registry.component.ts @@ -1,10 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, - NgSwitch, - NgSwitchCase, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, OnDestroy, @@ -79,12 +73,8 @@ import { followLink } from '../../shared/utils/follow-link-config.model'; RouterLink, ReactiveFormsModule, AsyncPipe, - NgIf, PaginationComponent, - NgSwitch, - NgSwitchCase, NgbTooltipModule, - NgForOf, BtnDisabledDirective, ], standalone: true, diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html index c321fb235d..38c6a1f349 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html @@ -1,10 +1,12 @@

{{'admin.batch-import.page.header' | translate}}

{{'admin.batch-import.page.help' | translate}}

-

- selected collection: {{getDspaceObjectName()}}  - {{'admin.batch-import.page.remove' | translate}} -

+ @if (dso) { +

+ selected collection: {{getDspaceObjectName()}}  + {{'admin.batch-import.page.remove' | translate}} +

+ }

@@ -21,32 +23,35 @@
+ [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate" + [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate" + [checked]="isUpload" + (change)="toggleUpload()" > {{'admin.batch-import.page.toggle.help' | translate}} - - + @if (isUpload) { + + + } -
- -
+ @if (!isUpload) { +
+ +
+ }
+ (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}} + (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts index 1f54b801c8..d4a578411d 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts @@ -1,7 +1,4 @@ -import { - Location, - NgIf, -} from '@angular/common'; +import { Location } from '@angular/common'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; @@ -36,7 +33,6 @@ import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzo selector: 'ds-batch-import-page', templateUrl: './batch-import-page.component.html', imports: [ - NgIf, TranslateModule, FormsModule, UiSwitchModule, diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html index 3a42eb7825..eefc372ac8 100644 --- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html +++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html @@ -4,34 +4,38 @@

{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}

-
- -
- -
-
+ @if (!isNewService) { +
+ +
+ +
+
+
-
+ }
-
- {{ 'ldn-new-service.form.error.name' | translate }} -
+ [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control" + formControlName="name" + id="name" + name="name" + type="text"> + @if (formModel.get('name').invalid && formModel.get('name').touched) { +
+ {{ 'ldn-new-service.form.error.name' | translate }} +
+ }
+ class="form-control" formControlName="description" id="description" name="description">
@@ -40,30 +44,34 @@
-
- {{ 'ldn-new-service.form.error.url' | translate }} -
+ [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control" + formControlName="url" + id="url" + name="url" + type="text"> + @if (formModel.get('url').invalid && formModel.get('url').touched) { +
+ {{ 'ldn-new-service.form.error.url' | translate }} +
+ }
-
- {{ 'ldn-new-service.form.error.score' | translate }} -
+ [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score" + id="score" + name="score" + min="0" + max="1" + step=".01" + class="form-control" + type="number"> + @if (formModel.get('score').invalid && formModel.get('score').touched) { +
+ {{ 'ldn-new-service.form.error.score' | translate }} +
+ }
@@ -73,21 +81,23 @@
+ [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2" + formControlName="lowerIp" + id="lowerIp" + name="lowerIp" + type="text"> -
-
- {{ 'ldn-new-service.form.error.ipRange' | translate }} + [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control" + formControlName="upperIp" + id="upperIp" + name="upperIp" + type="text">
+ @if ((formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)) { +
+ {{ 'ldn-new-service.form.error.ipRange' | translate }} +
+ }
{{ 'ldn-new-service.form.hint.ipRange' | translate }}
@@ -97,223 +107,242 @@
-
-
- {{ 'ldn-new-service.form.error.ldnurl' | translate }} + [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control" + formControlName="ldnUrl" + id="ldnUrl" + name="ldnUrl" + type="text"> + @if (formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched) { +
+ @if (formModel.get('ldnUrl').errors['required']) { +
+ {{ 'ldn-new-service.form.error.ldnurl' | translate }} +
+ } + @if (formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']) { +
+ {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }} +
+ }
-
- {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }} -
-
+ }
-
-
- -
- + @if (areControlsInitialized) { +
- +
-
- + @if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) { +
+ +
+
+ +
+ } +
- -
-
+ } -
-
- - - - -
-
-
- -
-
- -
- -
-
- -
- -
- -
-
-
-
- - -
-
- - - - + @for (constraint of (itemFiltersRD$ | async)?.payload?.page; track constraint; let internalIndex = $index) { + + } +
+
+
+
+ } +
+
+ +
+
+
+
+
+
+ + @if (markedForDeletionInboundPattern.includes(i)) { + + + + } +
+
-
+
- + } - + } {{ 'ldn-new-service.form.label.addPattern' | translate }} + class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}
-
-
- - - +
+
+ + + +
-
- -
- + + +
-

{{'service.overview.edit.modal' | translate }}

-

{{'service.overview.create.modal' | translate }}

+ @if (!isNewService) { +

{{'service.overview.edit.modal' | translate }}

+ } + @if (isNewService) { +

{{'service.overview.create.modal' | translate }}

+ }
-
- {{ 'service.overview.edit.body' | translate }} -
- - {{ 'service.overview.create.body' | translate }} - -
-
-
- - + @if (!isNewService) { +
+ {{ 'service.overview.edit.body' | translate }}
-
+ } + @if (isNewService) { + + {{ 'service.overview.create.body' | translate }} + + } +
+
+ @if (!isNewService) { +
+ + @if (!isNewService) { + + } +
+ } + @if (isNewService) { +
-
- + } +
+ diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts index 667669646c..07c0453be9 100644 --- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts +++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts @@ -5,11 +5,7 @@ import { transition, trigger, } from '@angular/animations'; -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -77,9 +73,7 @@ import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patter imports: [ ReactiveFormsModule, TranslateModule, - NgIf, NgbDropdownModule, - NgForOf, AsyncPipe, ], }) diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html index 1e43cfad5d..bd156cc0af 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html +++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html @@ -4,63 +4,67 @@
+ class="fas fa-plus pe-2">{{ 'process.overview.new' | translate }}
- -
- - - - - - - - - - - - - - - + + } + +
{{ 'service.overview.table.name' | translate }}{{ 'service.overview.table.description' | translate }}{{ 'service.overview.table.status' | translate }}{{ 'service.overview.table.actions' | translate }}
{{ ldnService.name }} - - -
- {{ ldnService.description }} -
- - - 		- - {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }} - - -
- - +
+
+
+ + } @@ -72,8 +76,8 @@

{{'service.overview.delete.header' | translate }}

@@ -84,12 +88,12 @@
+ [attr.aria-label]="'ldn-service-overview-close-modal' | translate" + class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts index cc2cba4704..59f21bb14a 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts +++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts @@ -1,8 +1,6 @@ import { AsyncPipe, NgClass, - NgFor, - NgIf, } from '@angular/common'; import { ChangeDetectionStrategy, @@ -54,8 +52,6 @@ import { LdnService } from '../ldn-services-model/ldn-services.model'; styleUrls: ['./ldn-services-directory.component.scss'], changeDetection: ChangeDetectionStrategy.Default, imports: [ - NgIf, - NgFor, TranslateModule, AsyncPipe, PaginationComponent, diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html index 3adb7e857b..0e0183fe84 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html @@ -13,11 +13,13 @@
  • {{'admin.notify.dashboard.outbound-logs' | translate}} - -
    - + +
    + @if ((notifyMetricsRows$ | async)?.length) { + + } +
    - diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts index 5508c18030..4fe93f4c86 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, Inject, @@ -46,7 +43,6 @@ import { imports: [ AdminNotifyMetricsComponent, RouterLink, - NgIf, TranslateModule, AsyncPipe, ], diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html index 52d93cbb62..3760dc341d 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html +++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html @@ -5,12 +5,14 @@
    -
    + @for (key of notifyMessageKeys; track key) { +
    {{ key + '.notify-detail-modal' | translate}}
    {{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}
    + }
    - 
    
+  @if (isCoarMessageVisible) {
+    
    
+  }
 
    
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
index 717d24a9fc..1bd5eb9ec7 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -26,9 +23,7 @@ import { AdminNotifyMessage } from '../models/admin-notify-message.model';
   ],
   standalone: true,
   imports: [
-    NgForOf,
     TranslateModule,
-    NgIf,
   ],
 })
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
index 48e2a42fe2..ce394175c3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -3,10 +3,12 @@
     
    {{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}
    
     
    
       
    
-        
+        @if ((selectedSearchConfig$ | async) !== defaultConfiguration) {
+          
+        }
       
    
       
     
    
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
index 2c6164ecda..7aa1e63c56 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -39,7 +36,6 @@ import { ThemedSearchComponent } from '../../../../shared/search/themed-search.c
     ThemedSearchComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
   ],
 })
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
index 3257bdd5ba..5c7910284f 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -1,9 +1,13 @@
-
    
-  
    {{ row.title | translate }}
    
-  
    
-    
    
-      
+@for (row of boxesConfig; track row) {
+  
    
+    
    {{ row.title | translate }}
    
+    
    
+      @for (box of row.boxes; track box) {
+        
    
+          
+        
    
+      }
     
    
   
    
-
    
+}
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index af5345f512..6519826ddf 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -17,7 +17,6 @@ import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
   imports: [
     NotificationBoxComponent,
     TranslateModule,
-    NgForOf,
   ],
 })
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index af540b094e..5c8360c726 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -11,41 +11,57 @@
       
     
     
-      
-        
-          
    {{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}
    
-          
    n/a
    
-        
-        
-          
-            
-              {{ message.relatedItem }}
-            
-          
-          
    n/a
    
-        
-        
-          
    {{ message.ldnService }}
    
-          
    n/a
    
-        
-        
-          
    {{ message.activityStreamType }}
    
-        
-        
-          
    {{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}
    
-        
-        
-          
    
-            
-            
-          
    
-        
-      
+      @for (message of (messagesSubject$ | async); track message) {
+        
+          
+            @if (message.queueLastStartTime) {
+              
    {{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}
    
+            }
+            @if (!message.queueLastStartTime) {
+              
    n/a
    
+            }
+          
+          
+            
+              
+                @if (message.relatedItem) {
+                  {{ message.relatedItem }}
+                }
+              
+            
+            @if (!message.relatedItem) {
+              
    n/a
    
+            }
+          
+          
+            @if (message.ldnService) {
+              
    {{ message.ldnService }}
    
+            }
+            @if (!message.ldnService) {
+              
    n/a
    
+            }
+          
+          
+            
    {{ message.activityStreamType }}
    
+          
+          
+            
    {{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}
    
+          
+          
+            
    
+              
+              @if (message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)) {
+                
+              }
+            
    
+          
+        
+      }
     
   
 
    
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
index f1c8d9ead6..ece05c30bb 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -42,8 +40,6 @@ import { AdminNotifyMessagesService } from '../services/admin-notify-messages.se
   standalone: true,
   imports: [
     TranslateModule,
-    NgForOf,
-    NgIf,
     DatePipe,
     AsyncPipe,
     TruncatableComponent,
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index cc544476cc..c063384389 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -8,51 +8,62 @@
       
    {{'admin.registries.bitstream-formats.create.new' | translate}}
    
 
 
-      
-        
    
-          
-            
-            
-              
-              
-              
-              
-              
-            
-            
-            
-            
-              
-              
-              
-              
-              
-            
-            
-          
    {{'admin.registries.bitstream-formats.table.selected' | translate}}{{'admin.registries.bitstream-formats.table.id' | translate}}{{'admin.registries.bitstream-formats.table.name' | translate}}{{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
    
-                
-              {{bitstreamFormat.id}}{{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
    
+      @if ((bitstreamFormats$ | async)?.payload?.totalElements > 0) {
+        
+          
    
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                @for (bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page; track bitstreamFormat) {
+                  
+                    
+                    
+                    
+                    
+                    
+                  
+                }
+              
+            
    {{'admin.registries.bitstream-formats.table.selected' | translate}}{{'admin.registries.bitstream-formats.table.id' | translate}}{{'admin.registries.bitstream-formats.table.name' | translate}}{{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
    
+                      
+                    {{bitstreamFormat.id}}{{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} @if (bitstreamFormat.internal) {
+                      ({{'admin.registries.bitstream-formats.table.internal' | translate}})
+                    }{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
    
+          
    
+            
+      }
+      @if ((bitstreamFormats$ | async)?.payload?.totalElements === 0) {
+        
-      
-      
+      }
 
       
    
-        
-        
+        @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
+          
+        }
+        @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
+          
+        }
       
    
     
    
   
    
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 74869670c5..bc0f76ea17 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -41,12 +37,10 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
   selector: 'ds-bitstream-formats',
   templateUrl: './bitstream-formats.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     RouterLink,
     TranslateModule,
     PaginationComponent,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
index be6ebf2599..7403623747 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
@@ -1,3 +1,5 @@
-
\ No newline at end of file
+@if (formModel) {
+  
+}
\ No newline at end of file
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 08c3343aa8..59fa50ee5b 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -35,7 +35,6 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
   templateUrl: './format-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index ff70c04d11..73072b6104 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -1,60 +1,65 @@
 
    
-    
    
-        
    
+  
    
+    
    
 
-            
    {{'admin.registries.metadata.head' | translate}}
    
+      
    {{'admin.registries.metadata.head' | translate}}
    
 
-            
    {{'admin.registries.metadata.description' | translate}}
    
+      
    {{'admin.registries.metadata.description' | translate}}
    
 
-            
+      
 
-            
-
-                
    
-                    
-                        
-                        
-                            
-                            
-                            
-                            
-                        
-                        
-                        
-                        
-                            
-                            
-                            
-                            
-                        
-                        
-                    
    {{'admin.registries.metadata.schemas.table.selected' | translate}}{{'admin.registries.metadata.schemas.table.id' | translate}}{{'admin.registries.metadata.schemas.table.namespace' | translate}}{{'admin.registries.metadata.schemas.table.name' | translate}}
    
-                                
-                            {{schema.id}}{{schema.namespace}}{{schema.prefix}}
    
-                
    
-
-                
-
-            
-
-            
    
-              
-            
    
+      @if ((metadataSchemas | async)?.payload?.totalElements > 0) {
+        
+          
    
+            
+              
+                
+                  
+                  
+                  
+                  
+                
+              
+              
+                @for (schema of (metadataSchemas | async)?.payload?.page; track schema) {
+                  
+                    
+                    
+                    
+                    
+                  
+                }
+              
+            
    {{'admin.registries.metadata.schemas.table.selected' | translate}}{{'admin.registries.metadata.schemas.table.id' | translate}}{{'admin.registries.metadata.schemas.table.namespace' | translate}}{{'admin.registries.metadata.schemas.table.name' | translate}}
    
+                      
+                    {{schema.id}}{{schema.namespace}}{{schema.prefix}}
    
+          
    
+            
+      }
 
+      @if ((metadataSchemas | async)?.payload?.totalElements === 0) {
+        
+      }
+
+      
    
+        @if ((metadataSchemas | async)?.payload?.page?.length > 0) {
+          
+        }
+      
    
+
     
    
+  
    
 
    
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index be1239ab95..8e5adeddf7 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -49,8 +47,6 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
     TranslateModule,
     AsyncPipe,
     PaginationComponent,
-    NgIf,
-    NgForOf,
     NgClass,
     RouterLink,
   ],
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index 15cc81d9ca..343e107e01 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,18 +1,16 @@
-
    
+@if (activeMetadataSchema$ | async) {
+  
    {{messagePrefix + '.edit' | translate}}
    
+} @else {
+  
    {{messagePrefix + '.create' | translate}}
    
+}
 
-
-    
    {{messagePrefix + '.create' | translate}}
    
-    
 
-
-    
    {{messagePrefix + '.edit' | translate}}
    
-    
 
 
+  [formModel]="formModel"
+  [formGroup]="formGroup"
+  [formLayout]="formLayout"
+  (cancel)="onCancel()"
+  (submitForm)="onSubmit()">
 
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index c58c4bef10..139f711920 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -39,7 +36,6 @@ import { FormComponent } from '../../../../shared/form/form.component';
   selector: 'ds-metadata-schema-form',
   templateUrl: './metadata-schema-form.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     TranslateModule,
     FormComponent,
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 44b6bfb697..c799d87b26 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,18 +1,16 @@
-
    
+@if (registryService.getActiveMetadataField() | async) {
+  
    {{messagePrefix + '.edit' | translate}}
    
+} @else {
+  
    {{messagePrefix + '.create' | translate}}
    
+}
 
-
-    
    {{messagePrefix + '.create' | translate}}
    
-    
 
-
-    
    {{messagePrefix + '.edit' | translate}}
    
-    
 
 
+  [formModel]="formModel"
+  [formLayout]="formLayout"
+  [formGroup]="formGroup"
+  (cancel)="onCancel()"
+  (submit)="onSubmit()">
 
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index bfadd018ef..63f93961be 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -35,7 +32,6 @@ import { FormComponent } from '../../../../shared/form/form.component';
   selector: 'ds-metadata-field-form',
   templateUrl: './metadata-field-form.component.html',
   imports: [
-    NgIf,
     FormComponent,
     TranslateModule,
     AsyncPipe,
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 19c5370a9c..438b37d3aa 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -8,52 +8,59 @@
 
       
+      (submitForm)="forceUpdateFields()">
 
       
    {{'admin.registries.schema.fields.head' | translate}}
    
 
       
-        
-          
    
-            
-              
-              
-                
-                
-                
-                
-              
-              
-              
-              
-                
-                
-                
-                
-              
-              
-            
    {{'admin.registries.schema.fields.table.selected' | translate}}{{'admin.registries.schema.fields.table.id' | translate}}{{'admin.registries.schema.fields.table.field' | translate}}{{'admin.registries.schema.fields.table.scopenote' | translate}}
    
-                  
-                {{field.id}}{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}{{field.scopeNote}}
    
-          
    
-            
+        @if (fields?.totalElements > 0) {
+          
+            
    
+              
+                
+                  
+                    
+                    
+                    
+                    
+                  
+                
+                
+                  @for (field of fields?.page; track field) {
+                    
+                      
+                      
+                      
+                      
+                    
+                  }
+                
+              
    {{'admin.registries.schema.fields.table.selected' | translate}}{{'admin.registries.schema.fields.table.id' | translate}}{{'admin.registries.schema.fields.table.field' | translate}}{{'admin.registries.schema.fields.table.scopenote' | translate}}
    
+                        
+                      {{field.id}}{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}{{field.scopeNote}}
    
+            
    
+              
+        }
 
-        
+        @if (fields?.totalElements === 0) {
+          
+        }
 
         
    
           
-          
+          @if (fields?.page?.length > 0) {
+            
+          }
         
    
           
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index ec5d6b4cb0..52f927073f 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -59,8 +57,6 @@ import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field
     MetadataFieldFormComponent,
     TranslateModule,
     PaginationComponent,
-    NgIf,
-    NgForOf,
     NgClass,
     RouterLink,
   ],
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
index 5199a115a6..c696fa23ba 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
@@ -1,64 +1,72 @@
 
    
-    
    
-        
    
+  
    
+    
    
 
-            
    {{ "admin.reports.collections.head" | translate }}
    
+      
    {{ "admin.reports.collections.head" | translate }}
    
 
-            
    
-                
-                    
-                        
-                          {{ "admin.reports.commons.filters" | translate }}
-                        
-                        
-                            
    
-                                
    
-                                    
-                                    
-                                
    
-                                
-                                
    
-                                    
-                                    
-                                
    
-                            
    
-                            
-                        
-                    
-                        
-                          {{ "admin.reports.collections.collections-report" | translate }}
-                        
-                        
-                            
-                                
-                                    
-                                        
-                                        
-                                        
-                                        
-                                        
-                                    
-                                    
-                                        
-                                        
-                                        
-                                    
-                                
-                                
-                                    
-                                        
-                                        
-                                        
-                                        
-                                        
-                                    
-                                
-                            
    {{ "admin.reports.collections.community" | translate }}{{ "admin.reports.collections.collection" | translate }}{{ "admin.reports.collections.nb_items" | translate }}{{ "admin.reports.collections.match_all_selected_filters" | translate }}{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}
    {{ results.summary.nbTotalItems }}{{ results.summary.allFiltersValue }}{{ filter.value }}
    {{ coll.communityLabel }}{{ coll.label }}{{ coll.nbTotalItems }}{{ coll.allFiltersValue }}{{ coll.values[filter.key] || 0 }}
    
-                            
-                        
-                    
-            
    
+      
    
+        
+          
+            
+              {{ "admin.reports.commons.filters" | translate }}
+            
+            
+              
    
+                
    
+                  
+                  
+                
    
+                
+                
    
+                  
+                  
+                
    
+              
    
+                
+              
+          
+            
+              {{ "admin.reports.collections.collections-report" | translate }}
+            
+            
+              
+                
+                  
+                    
+                    
+                    
+                    
+                    @for (filter of results.summary.values | keyvalue; track filter) {
+                      
+                    }
+                  
+                  
+                    
+                    
+                    @for (filter of results.summary.values | keyvalue; track filter) {
+                      
+                    }
+                  
+                
+                
+                  @for (coll of results.collections; track coll) {
+                    
+                      
+                      
+                      
+                      
+                      @for (filter of results.summary.values | keyvalue; track filter) {
+                        
+                      }
+                    
+                  }
+                
+              
    {{ "admin.reports.collections.community" | translate }}{{ "admin.reports.collections.collection" | translate }}{{ "admin.reports.collections.nb_items" | translate }}{{ "admin.reports.collections.match_all_selected_filters" | translate }}{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}
    {{ results.summary.nbTotalItems }}{{ results.summary.allFiltersValue }}{{ filter.value }}
    {{ coll.communityLabel }}{{ coll.label }}{{ coll.nbTotalItems }}{{ coll.allFiltersValue }}{{ coll.values[filter.key] || 0 }}
    
+                
+              
+            
+      
    
 
-        
    
     
    
+  
    
 
    
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index e1f54bd8d3..85924dd82f 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -1,7 +1,4 @@
-import {
-  KeyValuePipe,
-  NgForOf,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -37,7 +34,6 @@ import { FilteredCollections } from './filtered-collections.model';
     NgbAccordionModule,
     FiltersComponent,
     KeyValuePipe,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
index b5bc55f6ff..b12a7967c8 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
@@ -1,8 +1,10 @@
 import { Item } from 'src/app/core/shared/item.model';
 
+import { Collection } from '../../../core/shared/collection.model';
+
 export class FilteredItems {
 
-  public items: Item[] = [];
+  public items: FilteredItem[] = [];
   public itemCount: number;
 
   public clear() {
@@ -21,3 +23,8 @@ export class FilteredItems {
   }
 
 }
+
+export interface FilteredItem extends Omit {
+  index: number;
+  owningCollection?: Collection;
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index a765c4a190..6b67a12769 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -1,175 +1,201 @@
 
    
-    
    
-        
    
+  
    
+    
    
 
-            
    {{'admin.reports.items.head' | translate}}
    
+      
    {{'admin.reports.items.head' | translate}}
    
 
-            
    
-                
-                    
-                        
-                            {{'admin.reports.items.section.collectionSelector' | translate}}
-                        
-                        
-                            
-                            
    
-                                
-                                
-                            
    
-                            
-                        
-                    
-                        
-                            {{'admin.reports.items.section.metadataFieldQueries' | translate}}
-                        
-                        
-                            
    
-                                
-                                
-                            
    
-                            
     
    
-                            
    
-                                
    
-                                    
    
-                                        
    
-                                            
    
-                                                
-                                            
    
-                                            
    
-                                                
-                                            
    
-                                            
    
-                                                
-                                            
    
-                                            
    
-                                                
-                                                 
-                                                
-                                            
    
-                                        
    
-                                    
    
-                                
    
-                            
    
-                            
    
-                                
-                                
-                            
    
-                            
-                        
-                    
-                        
-                            {{'admin.reports.items.section.limitPaginateQueries' | translate}}
-                        
-                        
-                            
    
-                                
-                                
    
-                                    
-                                
    
-                            
    
-                            
    
-                                
-                                
    
-                                    
-                                
    
-                            
    
-                            
    
-                                
-                                
-                            
    
-                            
-                        
-                    
-                        
-                            {{'admin.reports.commons.filters' | translate}}
-                        
-                        
-                            
    
-                                
-                                
-                            
    
-                            
-                            
    
-                                
-                                
-                            
    
-                            
-                        
-                    
-                        
-                            {{'admin.reports.commons.additional-data' | translate}}
-                        
-                        
-                            
    
-                                
-                            
    
-                            
    
-                                
-                                
-                            
    
-                            
-                        
-                    
-                        
-                            {{'admin.reports.collections.item-results' | translate}}
-                        
-                        
-                            
-                                
-                                    
-                                        
-                                        
-                                        
-                                        
-                                        
-                                        
-                                    
-                                
-                                
-                                    
-                                        
-                                        
-                                        
-                                        
-                                        
-                                        
-                                    
-                                
-                            
    {{ "admin.reports.items.number" | translate }}{{ "admin.reports.items.id" | translate }}{{ "admin.reports.items.collection" | translate }}{{ "admin.reports.items.handle" | translate }}{{ "admin.reports.items.title" | translate }}{{ field }}
    {{ item.index }}{{ item.uuid }}{{ item.owningCollection.name }}{{ item.handle }}{{ item.name }}
-                                            
-                                                {{ mdvalue.value || "" }}
-                                            
-                                        
    
-                            
    
-                                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
-                            
    
-                            
    
-                                
-                                
-
-                            
    
-                            
    
-                            
-                        
-                    
-            
    
+      
    
+        
+          
+            
+              {{'admin.reports.items.section.collectionSelector' | translate}}
+            
+            
+              
+              
    
+                
+                
+              
    
+                
+              
+          
+            
+              {{'admin.reports.items.section.metadataFieldQueries' | translate}}
+            
+            
+              
    
+                
+                
+              
    
+              
     
    
+              
    
+                @for (pred of queryPredicatesArray().controls; track pred; let i = $index) {
+                  
    
+                    
    
+                      
    
+                        
    
+                          
+                        
    
+                        
    
+                          
+                        
    
+                        
    
+                          
+                        
    
+                        
    
+                          
+                           
+                          
+                        
    
+                      
    
+                    
    
+                  
    
+                }
+              
    
+              
    
+                
+                
+              
    
+                
+              
+          
+            
+              {{'admin.reports.items.section.limitPaginateQueries' | translate}}
+            
+            
+              
    
+                
+                
    
+                  
+                
    
+              
    
+              
    
+                
+                
    
+                  
+                
    
+              
    
+              
    
+                
+                
+              
    
+                
+              
+          
+            
+              {{'admin.reports.commons.filters' | translate}}
+            
+            
+              
    
+                
+                
+              
    
+              
+              
    
+                
+                
+              
    
+                
+              
+          
+            
+              {{'admin.reports.commons.additional-data' | translate}}
+            
+            
+              
    
+                
+              
    
+              
    
+                
+                
+              
    
+                
+              
+          
+            
+              {{'admin.reports.collections.item-results' | translate}}
+            
+            
+              
+                
+                  
+                    
+                    
+                    
+                    
+                    
+                    @for (field of queryForm.value['additionalFields']; track field) {
+                      
+                    }
+                  
+                
+                
+                  @for (item of results$ | async; track item) {
+                    
+                      
+                      
+                      
+                      
+                      
+                      @for (field of queryForm.value['additionalFields']; track field) {
+                        
+                      }
+                    
+                  }
+                
+              
    {{ "admin.reports.items.number" | translate }}{{ "admin.reports.items.id" | translate }}{{ "admin.reports.items.collection" | translate }}{{ "admin.reports.items.handle" | translate }}{{ "admin.reports.items.title" | translate }}{{ field }}
    {{ item.index }}{{ item.uuid }}@if (item.owningCollection) {
+                        {{ item.owningCollection.name }}
+                      }@if (item.handle) {
+                        {{ item.handle }}
+                      }{{ item.name }}
+                          @for (mdvalue of item.metadata[field]; track mdvalue) {
+                            
+                              {{ mdvalue.value || "" }}
+                            
+                          }
+                        
    
+              
    
+                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
+              
    
+              
    
+                
+                
+                
+              
    
+              
    
+                
+              
+            
+      
    
 
-        
    
     
    
+  
    
 
    
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 04ee4894ec..7782b0e416 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -38,14 +34,16 @@ import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
 import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
 import { Collection } from 'src/app/core/shared/collection.model';
 import { Community } from 'src/app/core/shared/community.model';
-import { Item } from 'src/app/core/shared/item.model';
 import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operators';
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
-import { FilteredItems } from './filtered-items-model';
+import {
+  FilteredItem,
+  FilteredItems,
+} from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
 import { PresetQuery } from './preset-query.model';
 import { QueryPredicate } from './query-predicate.model';
@@ -62,8 +60,6 @@ import { QueryPredicate } from './query-predicate.model';
     NgbAccordionModule,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
     FiltersComponent,
     BtnDisabledDirective,
   ],
@@ -81,7 +77,7 @@ export class FilteredItemsComponent implements OnInit {
   queryForm: FormGroup;
   currentPage = 0;
   results: FilteredItems = new FilteredItems();
-  results$: Observable;
+  results$: Observable;
   @ViewChild('acc') accordionComponent: NgbAccordion;
 
   constructor(
diff --git a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
index 56334b041f..b26a42a8d8 100644
--- a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
+++ b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
@@ -9,6 +9,7 @@ export class OptionVO {
   id: string;
   name$: Observable;
   disabled = false;
+  isDefault?: boolean;
 
   static collection(id: string, name: string, disabled: boolean = false): OptionVO {
     const opt = new OptionVO();
diff --git a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
index 213819b70e..9f0fb01ce3 100644
--- a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
+++ b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
@@ -5,6 +5,7 @@ export class PresetQuery {
   id: string;
   label: string;
   predicates: QueryPredicate[];
+  isDefault?: boolean;
 
   static of(id: string, label: string, predicates: QueryPredicate[]) {
     const query = new PresetQuery();
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
index 2fa1a2f547..88e4335506 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.html
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -1,19 +1,23 @@
 
    
-    
-         
-         
-        
-         
-        
-         
-         
-    
+  
+     
+     
+    
+     
+    
+     
+     
+  
 
    
-
    
+@for (group of allFilters(); track group) {
+  
    
     {{group.key | translate}}
     
-        
    
-            
+      @for (filter of group.filters; track filter) {
+        
    
+          
         
    
+      }
     
-
    
+  
    
+}
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
index 85b7932ab4..24bd1103c9 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.ts
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -23,7 +23,6 @@ import { FilterGroup } from './filter-group.model';
   templateUrl: './filters-section.component.html',
   styleUrls: ['./filters-section.component.scss'],
   imports: [
-    NgForOf,
     ReactiveFormsModule,
     TranslateModule,
   ],
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
index ba4ab15363..5028070c90 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
@@ -1,30 +1,52 @@
 
    
   
-     {{"admin.search.item.move" | translate}}
-  
+    @if (!small) {
+     {{"admin.search.item.move" | translate}}
+  }
+
 
-  
-     {{"admin.search.item.make-private" | translate}}
-  
+@if (item && item.isDiscoverable) {
+  
+    @if (!small) {
+     {{"admin.search.item.make-private" | translate}}
+  }
+
+}
 
-  
-     {{"admin.search.item.make-public" | translate}}
-  
+@if (item && !item.isDiscoverable) {
+  
+    @if (!small) {
+     {{"admin.search.item.make-public" | translate}}
+  }
+
+}
 
-  
-     {{"admin.search.item.edit" | translate}}
-  
+
+  @if (!small) {
+   {{"admin.search.item.edit" | translate}}
+}
+
 
-  
-     {{"admin.search.item.withdraw" | translate}}
-  
+@if (item && !item.isWithdrawn) {
+  
+    @if (!small) {
+     {{"admin.search.item.withdraw" | translate}}
+  }
+
+}
 
-  
-     {{"admin.search.item.reinstate" | translate}}
-  
+@if (item && item.isWithdrawn) {
+  
+    @if (!small) {
+     {{"admin.search.item.reinstate" | translate}}
+  }
+
+}
 
-  
-     {{"admin.search.item.delete" | translate}}
-  
+
+  @if (!small) {
+   {{"admin.search.item.delete" | translate}}
+}
+
 
    
 
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index 89d51481d7..681b02ce0e 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -26,7 +23,7 @@ import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
   styleUrls: ['./item-admin-search-result-actions.component.scss'],
   templateUrl: './item-admin-search-result-actions.component.html',
   standalone: true,
-  imports: [NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 41376f777e..fc79c58b99 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,64 +1,62 @@
-
+        
    
+          
    
+            {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+          
    
+        
    
+      
+    
    
+  
+}
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index f882a5b2f3..910a384a8b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -47,7 +45,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
   styleUrls: ['./admin-sidebar.component.scss'],
   animations: [slideSidebar],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgbDropdownModule, NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index d051136921..0450d90a6f 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -4,16 +4,16 @@
      params: {endColor: (sidebarActiveBg$ | async)}
      }">
   
+    role="menuitem" tabindex="0"
+    aria-haspopup="menu"
+    [attr.aria-controls]="adminMenuSectionId(section.id)"
+    [attr.aria-expanded]="isExpanded$ | async"
+    [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
+    [class.disabled]="section.model?.disabled"
+    (click)="toggleSection($event)"
+    (keyup.space)="toggleSection($event)"
+    href="javascript:void(0);"
+    >
     
@@ -21,25 +21,29 @@
       
    
         
           
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;">
         
         
       
    
     
    
   
-  
    
-    
    
-    
    
-      
    
-        
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 37a4d0c30f..03f9397819 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -37,7 +35,7 @@ import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sid
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor],
   standalone: true,
-  imports: [NgClass, NgComponentOutlet, NgIf, NgFor, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 
 export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionComponent implements OnInit {
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
index 7f19ef3c2e..b2ce95bf7c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
@@ -1,8 +1,12 @@
 
    
   
-     {{"admin.workflow.item.delete" | translate}}
-  
-  
-     {{"admin.workflow.item.send-back" | translate}}
-  
+    @if (!small) {
+     {{"admin.workflow.item.delete" | translate}}
+  }
+
+
+  @if (!small) {
+   {{"admin.workflow.item.send-back" | translate}}
+}
+
 
    
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
index 29e1b65eda..a565c4d9b2 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -20,7 +17,7 @@ import {
   styleUrls: ['./workflow-item-admin-workflow-actions.component.scss'],
   templateUrl: './workflow-item-admin-workflow-actions.component.html',
   standalone: true,
-  imports: [NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for a workflow-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
index 200286e08f..150411ec40 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
@@ -1,43 +1,47 @@
 
    
-    
    {{'supervision-group-selector.header' | translate}}
-        
+  
    {{'supervision-group-selector.header' | translate}}
+    
+  
    
+  
    
+    
    
+      
    
+        
+        
+        @if (isSubmitted && (!selectedOrderType || selectedOrderType === '')) {
+          
+        }
+      
    
     
    
-    
    
-        
    
-            
    
-                
-                
-                
-            
    
-        
    
-        
    
-            
    
-                
-                
-                    
-                    
-                
-                
-            
    
-        
    
-
-        
    
-          
-          
-        
    
+    
    
+      
    
+        
+        
+          
+          @if (isSubmitted && !selectedGroup) {
+            
+          }
+        
+        
+      
    
     
    
+    
+    
    
+      
+      
+    
    
+  
    
 
    
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
index 67dcd09b8e..6dea020c59 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,7 +34,7 @@ import { ErrorComponent } from '../../../../../../shared/error/error.component';
   styleUrls: ['./supervision-order-group-selector.component.scss'],
   templateUrl: './supervision-order-group-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, ErrorComponent, EpersonGroupListComponent, TranslateModule],
+  imports: [FormsModule, ErrorComponent, EpersonGroupListComponent, TranslateModule],
 })
 export class SupervisionOrderGroupSelectorComponent {
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
index 75e10a10df..3d3e912f91 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
@@ -1,15 +1,19 @@
 
-  
    
-    
    
-      {{'workflow-item.search.result.list.element.supervised-by' | translate}} 
+  @if (supervisionOrders?.length > 0) {
+    
    
+      
    
+        {{'workflow-item.search.result.list.element.supervised-by' | translate}} 
+      
    
+      
    
+        @for (supervisionOrder of supervisionOrders; track supervisionOrder) {
+          
+            {{ dsoNameService.getName(supervisionOrder.group) }}
+            
+          
+        }
+      
    
     
    
-    
-  
    
+  }
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
index fbd48d4078..ae5e85019c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -42,7 +38,7 @@ export interface SupervisionOrderListEntry {
   templateUrl: './supervision-order-status.component.html',
   styleUrls: ['./supervision-order-status.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgFor, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class SupervisionOrderStatusComponent implements OnChanges {
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
index 2b904a5429..98405fffeb 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
@@ -1,16 +1,22 @@
 
    
   
+  (delete)="deleteSupervisionOrder($event)">
 
    
 
 
    
   
-     {{"admin.workflow.item.delete" | translate}}
-  
-  
-     {{'admin.workflow.item.policies' | translate}}
-  
-  
-     {{'admin.workflow.item.supervision' | translate}}
-  
+    @if (!small) {
+     {{"admin.workflow.item.delete" | translate}}
+  }
+
+
+  @if (!small) {
+   {{'admin.workflow.item.policies' | translate}}
+}
+
+
+  @if (!small) {
+   {{'admin.workflow.item.supervision' | translate}}
+}
+
 
    
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
index 2e407f92db..04264b2c8f 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -52,7 +49,7 @@ import {
   styleUrls: ['./workspace-item-admin-workflow-actions.component.scss'],
   templateUrl: './workspace-item-admin-workflow-actions.component.html',
   standalone: true,
-  imports: [SupervisionOrderStatusComponent, NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [SupervisionOrderStatusComponent, NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for a workspace-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
index 70fbc6f667..38703c3182 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
@@ -1,12 +1,14 @@
 
 
 
    
-    
    
-        {{ "admin.workflow.item.workflow" | translate }}
-    
    
+  
    
+    {{ "admin.workflow.item.workflow" | translate }}
+  
    
 
    
 
      
-    
    • 
-        
-    
      • 
+  
    • 
+    @if (object) {
+      
+    }
+  
      • 
 
    
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
index 8ceb4b12bc..8df382a7b3 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   ComponentRef,
@@ -43,7 +43,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflo
   styleUrls: ['./workflow-item-search-result-admin-workflow-grid-element.component.scss'],
   templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, WorkflowItemAdminWorkflowActionsComponent, TranslateModule, DynamicComponentLoaderDirective],
+  imports: [WorkflowItemAdminWorkflowActionsComponent, TranslateModule, DynamicComponentLoaderDirective],
 })
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
index f34d17da51..2ecd0a72a1 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
@@ -1,10 +1,12 @@
 
    
-    {{ "admin.workflow.item.workflow" | translate }}
+  {{ "admin.workflow.item.workflow" | translate }}
 
    
-
+@if (item$ | async) {
+  
+}
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
index 60740fb34b..584e79dccc 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -42,7 +39,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflo
   styleUrls: ['./workflow-item-search-result-admin-workflow-list-element.component.scss'],
   templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, WorkflowItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
+  imports: [ListableObjectComponentLoaderComponent, WorkflowItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
index 15e0699f28..32777bfa39 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
@@ -1,13 +1,15 @@
 {{ "admin.workflow.item.workspace" | translate }}
-
+@if (item$ | async) {
+  
+}
 
 
+  [supervisionOrderList]="supervisionOrder$ | async"
+  [wsi]="dso"
+  (create)="reloadObject($event)"
+(delete)="reloadObject($event)">
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
index 7cf63a603b..c9b0e6ca67 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -52,7 +49,7 @@ import { WorkspaceItemAdminWorkflowActionsComponent } from '../../actions/worksp
   styleUrls: ['./workspace-item-search-result-admin-workflow-list-element.component.scss'],
   templateUrl: './workspace-item-search-result-admin-workflow-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, WorkspaceItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
+  imports: [ListableObjectComponentLoaderComponent, WorkspaceItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index 259ab599cb..acbb38fe27 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,33 +1,41 @@
 
   
    
-    
    
-      
    
-        
-      
    
-      
    
-        
    
-          
    
-            
    
-              
    {{dsoNameService.getName(bitstreamRD?.payload)}} ({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})
    
+    @if (bitstreamRD?.hasSucceeded) {
+      
    
+        
    
+          
+        
    
+        
    
+          
    
+            
    
+              
    
+                
    {{dsoNameService.getName(bitstreamRD?.payload)}} ({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})
    
+              
    
             
    
           
    
+          @if (formGroup) {
+            
+              
    
+                {{'bitstream.edit.authorizations.link' | translate}}
+              
    
+                
+          }
         
    
-        
-          
    
-            {{'bitstream.edit.authorizations.link' | translate}}
-          
    
-            
       
    
-    
    
-    
-    
+    }
+    @if (bitstreamRD?.hasFailed) {
+      
+    }
+    @if (!bitstreamRD || bitstreamRD?.isLoading) {
+      
+    }
   
    
 
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index b54a7bbaed..6ad82b2a74 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -87,7 +84,6 @@ import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.compo
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     FormComponent,
-    NgIf,
     VarDirective,
     ThemedThumbnailComponent,
     AsyncPipe,
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
index 3bba89622f..cbf9f0c886 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.html
+++ b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -1,20 +1,22 @@
 
-    
    
+  
+}
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 4cb07abd87..87366d38c6 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformServer,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -69,7 +68,6 @@ export const BBM_PAGINATION_ID = 'bbm';
   templateUrl: './browse-by-metadata.component.html',
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
index e2c0c52827..f533757d68 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
@@ -1,23 +1,25 @@
 
    
-  
    
-    {{ ('browse.title') | translate:{
-    field: 'browse.metadata.' + vocabularyName | translate,
-    startsWith: '',
-    value: '',
-  } }}
-  
    
+  @if (displayTitle) {
+    
    
+      {{ ('browse.title') | translate:{
+      field: 'browse.metadata.' + vocabularyName | translate,
+      startsWith: '',
+      value: '',
+      } }}
+    
    
+  }
   
    
     
+      [vocabularyOptions]=vocabularyOptions
+      [multiSelect]="true"
+      [showAdd]="false"
+      (select)="onSelect($event)"
+      (deselect)="onDeselect($event)">
     
   
    
   
-    {{ 'browse.taxonomy.button' | translate }}
+    [routerLink]="['/search']"
+    [queryParams]="queryParams"
+    [queryParamsHandling]="'merge'">
+  {{ 'browse.taxonomy.button' | translate }}
 
    
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index 2372c7d0c7..4115bc7349 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -52,7 +49,6 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
     AsyncPipe,
     ComcolPageHeaderComponent,
     ComcolPageLogoComponent,
-    NgIf,
     ThemedComcolPageHandleComponent,
     ThemedComcolPageContentComponent,
     DsoEditMenuComponent,
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index 7d6e3ce716..2c8f9eeaa1 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformServer,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -39,7 +38,6 @@ import {
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
index 0758435db8..49890c7cb5 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -64,8 +60,6 @@ import {
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
-    NgClass,
     VarDirective,
   ],
 })
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index f3124720ca..96bea31837 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -19,7 +19,7 @@
                 [dangerConfirm]="true"
                 [hideCollection]="true"
                 (confirm)="mapItems($event, true)"
-                (cancel)="onCancel()">
+              (cancel)="onCancel()">
             
    
           
         
    • 
@@ -29,30 +29,34 @@
             
    
               
    
                 
+                  [query]="(searchOptions$ | async)?.query"
+                  [scope]="(searchOptions$ | async)?.scope"
+                  [currentUrl]="'./'"
+                  [inPlaceSearch]="true"
+                  [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
+                  (submitSearch)="performedSearch = true">
                 
               
    
             
    
 
-            
    
-              
+                
-            
    
-            
+              
+            }
+            @if (!performedSearch) {
+              
+            }
               
         
       
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 351a5daf60..4fce1601a9 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -86,7 +83,6 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     TranslateModule,
     AsyncPipe,
     ItemSelectComponent,
-    NgIf,
     BrowserOnlyPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index e5b8bd6945..d38e38dd83 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,61 +1,71 @@
 
    
   
    
-    
    
-      
    
-        
-        
    
-                
    
-            
-            
-            
-            
-            
-            
-
-            
-            
-            
-            
-            
-            
-            
-            
-            
-          
    
-          
-        
    
-        
    
-          
-          
-          
-
-          
-        
    
-        
    
-          
-          
-          
-        
    
+    *ngVar="(collectionRD$ | async) as collectionRD">
+    @if (collectionRD?.hasSucceeded) {
+      
    
+        @if (collectionRD?.payload; as collection) {
+          
    
+            
+            
    
+              
    
+                
+                
+                
+                
+                @if (logoRD$) {
+                  
+                  
+                }
+                
+                
+                
+                
+                
+                
+                
+                
+                
+              
    
+              
+            
    
+            
    
+              
+              
+              
+              
+            
    
+            @if (collection.copyrightText) {
+              
    
+                
+                
+                
+              
    
+            }
+          
    
+        }
       
    
-    
    
-    
-    
+    }
+    @if (collectionRD?.hasFailed) {
+      
+    }
+    @if (collectionRD?.isLoading) {
+      
+    }
   
    
 
    
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 0d240f5328..043d7e6426 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -65,7 +62,6 @@ import { getCollectionPageRoute } from './collection-page-routing-paths';
   imports: [
     ThemedComcolPageContentComponent,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
     TranslateModule,
     ViewTrackerComponent,
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index 5c1b7b32a5..63e52925b9 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,15 +1,19 @@
-
    
-  
    
-    
    
-      
    {{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}
    
+@if ((isLoading$ | async) === false) {
+  
    
+    
    
+      
    
+        
    {{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}
    
+      
    
     
    
+    
   
    
-  
-
    
+}
 
 
    
-  
+  @if (isLoading$ | async) {
+    
+  }
 
    
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
index a26bc9d6f8..989d77c15b 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -32,7 +29,6 @@ import { CollectionFormComponent } from '../collection-form/collection-form.comp
     TranslateModule,
     AsyncPipe,
     ThemedLoadingComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index 3bc2d23c34..2147cb85c0 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -1,23 +1,27 @@
 
    
-    
    
-        
-            
    
-                
    {{ 'collection.delete.head' | translate}}
    
-                
    {{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}
    
-                
    
-                  
    
-                    
-                    
-                  
    
-                
    
-            
    
-            
+  
    
+    
+      
    
+        
    {{ 'collection.delete.head' | translate}}
    
+        
    {{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}
    
+        
    
+          
    
+            
+            
+          
    
+        
    
+      
    
+        
 
-    
    
+  
    
 
 
    
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index acc716b52a..61a6bd3336 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -30,7 +27,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
     VarDirective,
     BtnDisabledDirective,
   ],
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
index 4e957cf867..5f7ed57dcd 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
@@ -1,7 +1,8 @@
-
-
+@if (itemRD$ | async; as itemRD) {
+  
+  
+}
 
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
index 809fdcede8..6d63b69533 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,7 +18,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./collection-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index 845c82458a..28c5f21869 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,23 +1,29 @@
 
    
   {{ 'collection.edit.template.label' | translate}}
   
    
-    
-    
-    
+    @if (!itemTemplateRD?.payload) {
+      
+    }
+    @if (itemTemplateRD?.payload) {
+      
+    }
+    @if (itemTemplateRD?.payload) {
+      
+    }
   
    
 
    
 
+  [isCreation]="false"
+  (submitForm)="onSubmit($event)"
+  (back)="navigateToHomePage()"
+(finish)="navigateToHomePage()">
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index df35199755..26f55770c1 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -56,7 +53,6 @@ import { getCollectionItemTemplateRoute } from '../../collection-page-routing-pa
     RouterLink,
     AsyncPipe,
     TranslateModule,
-    NgIf,
     VarDirective,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
index 7cd3d6a342..9408bd2ab3 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
@@ -1,8 +1,9 @@
 
    
-  
-  
+  @for (comcolRole of comcolRoles$ | async; track comcolRole) {
+    
+    
+  }
 
    
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index f402c99caf..bde3d30828 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,6 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './collection-roles.component.html',
   imports: [
     ComcolRoleComponent,
-    NgForOf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 9a46fac09a..147b10ff62 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,54 +1,65 @@
 
    
-    
    
-        
    {{ 'collection.source.controls.head' | translate }}
    
-        
    
-            {{'collection.source.controls.harvest.status' | translate}}
-            {{contentSource?.harvestStatus}}
-        
    
-        
    
-            {{'collection.source.controls.harvest.start' | translate}}
-            {{contentSource?.harvestStartTime ? contentSource?.harvestStartTime : 'collection.source.controls.harvest.no-information'|translate }}
-        
    
-        
    
-            {{'collection.source.controls.harvest.last' | translate}}
-            {{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}
-        
    
-        
    
-            {{'collection.source.controls.harvest.message' | translate}}
-            {{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}
-        
    
-
-        
-        
-        
-        
-        
-        
-
-
+      }
     
    
+  }
 
    
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index e35a64af16..1e07978af7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import {
   Component,
@@ -55,7 +52,6 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
     VarDirective,
     BtnDisabledDirective,
   ],
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 715ef9e726..7f392b2f02 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,74 +1,92 @@
 
    
-    
    
-        
-        
-        
-    
    
-    
    {{ 'collection.edit.tabs.source.head' | translate }}
    
-    
    
-        
-        
-    
    
-    
-    
    {{ 'collection.edit.tabs.source.form.head' | translate }}
    
+  
    
+    @if ((isReinstatable$ | async) !== true) {
+      
+  }
+  @if (isReinstatable$ | async) {
+    
+}
+
+
    
+
    {{ 'collection.edit.tabs.source.head' | translate }}
    
+@if (contentSource) {
+  
    
+    
+    
+  
    
+}
+@if (!contentSource) {
+  
+}
+@if (contentSource && (contentSource?.harvestType !== harvestTypeNone)) {
+  
    {{ 'collection.edit.tabs.source.form.head' | translate }}
    
+}
 
    
 
    
-    
+  @if (formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)) {
+    
+  }
 
    
-
    
+@if ((contentSource?.harvestType !== harvestTypeNone)) {
+  
    
     
    
-        
    
-            
    
-                
-                
-                
-            
    
-        
    
-    
    
+      
    
+        
    
+          @if ((isReinstatable$ | async) !== true) {
+            
+        }
+        @if (isReinstatable$ | async) {
+          
+      }
+      
+  
    
 
    
+
    
+
    
+}
 
+  [isEnabled]="(hasChanges$ | async) !== true"
+  [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
+  [collection]="(collectionRD$ |async)?.payload"
+  >
 
 
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index afeb2e2352..50b869e636 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   Location,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -78,7 +77,6 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
   imports: [
     AsyncPipe,
     TranslateModule,
-    NgIf,
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
index e629f80570..03fe92faa8 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -28,9 +26,7 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
     RouterLink,
     TranslateModule,
     NgClass,
-    NgForOf,
     RouterOutlet,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index 7f0b2efba2..765d49b7bf 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -1,13 +1,17 @@
 
    
   
    
     
    
-      
+      @if (itemRD?.hasSucceeded) {
         
    {{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}
    
         
         
-          
-      
-      
+      }
+      @if (itemRD?.isLoading) {
+        
+      }
+      @if (itemRD?.hasFailed) {
+        
+      }
     
    
   
    
 
    
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index f7c5dc4b14..eb8b36ec89 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -39,7 +36,6 @@ import { getCollectionEditRoute } from '../collection-page-routing-paths';
     RouterLink,
     AsyncPipe,
     VarDirective,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     AlertComponent,
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index 6f3fc66705..864b5032d5 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,18 +1,24 @@
-
+@if ((dataSource.loading$ | async) && !loadingNode) {
+  
+}
 
   
   
+    class="example-tree-node show-more-node">
     
    
       
       
    
-        
-        
+        @if ((dataSource.loading$ | async) !== true) {
+          
+        }
+        @if (node===loadingNode && dataSource.loading$ | async) {
+          
+        }
       
    
     
    
     
    
@@ -22,51 +28,61 @@
   
   
   
+    class="example-tree-node expandable-node">
     
    
-      
+      @if (hasChild(null, node) | async) {
+        
+      }
       
-      
+      @if ((hasChild(null, node) | async) !== true) {
+        
+      }
       
    
         
           {{ dsoNameService.getName(node.payload) }}
            
-          {{node.payload.archivedItemsCount}}
+          @if (node.payload.archivedItemsCount >= 0) {
+            {{node.payload.archivedItemsCount}}
+          }
         
       
    
     
    
     
       
    
-        
    
-          
-          
-            {{node.payload.shortDescription}}
-          
-        
    
+        @if (node.payload.shortDescription) {
+          
    
+            
+            
+              {{node.payload.shortDescription}}
+            
+          
    
+        }
       
    
         
-    
    
-      
-      
-    
    
+    @if (node===loadingNode && dataSource.loading$ | async) {
+      
    
+        
+        
+      
    
+    }
       
   
   
+    class="example-tree-node childless-node">
     
    
       
    
     
       
    
-        
    
-          
-          
-            {{node.payload.shortDescription}}
-          
-        
    
+        @if (node.payload.shortDescription) {
+          
    
+            
+            
+              {{node.payload.shortDescription}}
+            
+          
    
+        }
       
    
         
       
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index 5819471d7e..c87fbf5d13 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -5,7 +5,6 @@ import {
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -42,7 +41,7 @@ import { FlatNode } from '../flat-node.model';
   templateUrl: './community-list.component.html',
   styleUrls: ['./community-list.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts
index d32d9e408f..147f6254ea 100644
--- a/src/app/community-page/community-form/community-form.component.ts
+++ b/src/app/community-page/community-form/community-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -49,8 +45,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
-    NgClass,
     VarDirective,
   ],
 })
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index c04575841e..13e5558d1b 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -1,43 +1,53 @@
 
    
-  
    
-    
    
-      
-      
    
-        
    
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-        
    
-        
-      
    
-      
    
-
-        
-        
-        
-
-        
-      
    
-      
    
-        
-        
-        
-      
    
+  @if (communityRD?.hasSucceeded) {
+    
    
+      @if (communityRD?.payload; as communityPayload) {
+        
    
+          
+          
    
+            
    
+              
+              
+              
+              @if (logoRD$) {
+                
+                
+              }
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
    
+            
+          
    
+          
    
+            
+            
+            
+            
+          
    
+          @if (communityPayload.copyrightText) {
+            
    
+              
+              
+              
+            
    
+          }
+        
    
+      }
     
    
-  
    
+  }
 
-  
-  
+  @if (communityRD?.hasFailed) {
+    
+  }
+  @if (communityRD?.isLoading) {
+    
+  }
 
    
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
index d04ecbee19..c8c947c900 100644
--- a/src/app/community-page/community-page.component.ts
+++ b/src/app/community-page/community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -56,7 +53,6 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com
     ThemedComcolPageContentComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 1d3d6eb871..c07ca9c2e8 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -1,18 +1,25 @@
-
    
-  
    
-    
    
-      
-        
    {{ 'community.create.head' | translate }}
    
-        
    
+    
    
+      
    
+        
+          @if (!parent) {
+            
    {{ 'community.create.head' | translate }}
    
+          } @else {
+            
    {{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}
    
-          
+          }
+        
+      
    
     
    
+    
   
    
-  
-
    
+}
 
 
    
-  
+  @if (isLoading$ | async) {
+    
+  }
 
    
diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts
index 082f6c4f0b..7c0c26ffcd 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -31,7 +28,6 @@ import { CommunityFormComponent } from '../community-form/community-form.compone
     CommunityFormComponent,
     TranslateModule,
     VarDirective,
-    NgIf,
     AsyncPipe,
     ThemedLoadingComponent,
   ],
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 07b0bdfa9d..3403cc45db 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -1,22 +1,26 @@
 
    
-    
    
-        
-            
    
-                
    {{ 'community.delete.head' | translate}}
    
-                
    {{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}
    
-                
    
-                    
    
-                        
-                        
-                    
    
-                
    
-            
    
-            
-    
    
+  
    
+    
+      
    
+        
    {{ 'community.delete.head' | translate}}
    
+        
    {{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}
    
+        
    
+          
    
+            
+            
+          
    
+        
    
+      
    
+        
+  
    
 
 
    
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 9c19a5eb47..4799cd2db8 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -31,7 +28,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
index b4f2123b86..5f7d1d8fc4 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
@@ -1,6 +1,7 @@
-
-
+@if (itemRD$ | async; as itemRD) {
+  
+  
+}
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
index a0e094e21d..cc632c0e94 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,7 +18,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./community-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
index 7a048cf923..86e5b113fd 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
@@ -1,8 +1,9 @@
 
    
-  
-  
+  @for (comcolRole of comcolRoles$ | async; track comcolRole) {
+    
+    
+  }
 
    
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
index 2e85cbe4c3..69234e07c3 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,6 @@ import { ComcolRoleComponent } from '../../../shared/comcol/comcol-forms/edit-co
   imports: [
     ComcolRoleComponent,
     AsyncPipe,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts
index 194976c3a8..77300023be 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -28,9 +26,7 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
     RouterLink,
     TranslateModule,
     NgClass,
-    NgForOf,
     RouterOutlet,
-    NgIf,
     AsyncPipe,
   ],
 })
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
index 59d7b3bb5e..825399c23b 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,13 +1,19 @@
 
-  
    
-    
    {{'community.sub-collection-list.head' | translate}}
    
-    
-    
-  
    
-  
-  
+  @if (subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0) {
+    
    
+      
    {{'community.sub-collection-list.head' | translate}}
    
+      
+      
+    
    
+  }
+  @if (subCollectionsRD?.hasFailed) {
+    
+  }
+  @if (subCollectionsRD?.isLoading) {
+    
+  }
     
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index 1e8ff1d46c..1d12860628 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -44,7 +41,6 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
index a811014bcc..151737573e 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
@@ -1,8 +1,8 @@
-
+@if ((community$ | async); as community) {
   
+    [community]="community">
   
   
+    [community]="community">
   
-
+}
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
index 7aed3be076..ea21c66b54 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,6 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sub-community-li
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
     AsyncPipe,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
index 7f9840f6b7..7c3d23b809 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
@@ -1,13 +1,19 @@
 
-  
    
-    
    {{'community.sub-community-list.head' | translate}}
    
-    
-    
-  
    
-  
-  
+  @if (subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0) {
+    
    
+      
    {{'community.sub-community-list.head' | translate}}
    
+      
+      
+    
    
+  }
+  @if (subCommunitiesRD?.hasFailed) {
+    
+  }
+  @if (subCommunitiesRD?.isLoading) {
+    
+  }
     
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 36bd9919bb..972ba3d7fb 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -43,7 +40,6 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ErrorComponent,
     ThemedLoadingComponent,
     VarDirective,
-    NgIf,
     ObjectCollectionComponent,
     AsyncPipe,
     TranslateModule,
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
index e015dd01d9..e2a00f2e75 100644
--- a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
+++ b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
@@ -88,6 +88,15 @@ export interface SourceQualityAssuranceEventMessageObject {
    */
   pidHref: string;
 
+  /**
+   * Possible link to a page
+   */
+  href?: string;
+
+  /**
+   * The service Id
+   */
+  serviceId?: string;
 }
 
 /**
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index 9bac2af51d..b0f6009e98 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -44,7 +44,7 @@ import { RegistryService } from './registry.service';
 @Component({
   template: '',
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class DummyComponent {
 }
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index 64b305ff64..403def3d32 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -40,7 +40,7 @@ import anything = jasmine.anything;
 @Component({
   template: '',
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class DummyComponent {
 }
diff --git a/src/app/curation-form/curation-form.component.html b/src/app/curation-form/curation-form.component.html
index 93c89499f3..b312a75dd7 100644
--- a/src/app/curation-form/curation-form.component.html
+++ b/src/app/curation-form/curation-form.component.html
@@ -1,20 +1,24 @@
 
    
-    
    
-        
    
-            
    
-                
-                
-            
    
-            
    
-                
-                
-                {{'curation.form.handle.hint' |translate }}
-            
    
+  
    
+    
    
+      
    
+        
+        
+      
    
+      @if (!hasHandleValue()) {
+        
    
+          
+          
+          {{'curation.form.handle.hint' |translate }}
         
    
-        
+      }
     
    
+    
+  
    
 
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
index 8e1c1b26c8..3a69a09466 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -53,7 +50,7 @@ export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
   selector: 'ds-curation-form',
   templateUrl: './curation-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, NgIf, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class CurationFormComponent implements OnDestroy, OnInit {
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index aee9fb980c..d1ec80376e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -1,16 +1,18 @@
 
    
   
-  
-  
+  @for (mdValue of form.fields[mdField]; track mdValue; let idx = $index) {
+    
+    
+  }
 
    
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
index a96b77be62..003ce13ad3 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -3,10 +3,7 @@ import {
   CdkDropList,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -32,7 +29,7 @@ import { DsoEditMetadataValueHeadersComponent } from '../dso-edit-metadata-value
   styleUrls: ['./dso-edit-metadata-field-values.component.scss'],
   templateUrl: './dso-edit-metadata-field-values.component.html',
   standalone: true,
-  imports: [CdkDropList, DsoEditMetadataValueHeadersComponent, NgFor, DsoEditMetadataValueComponent, AsyncPipe],
+  imports: [CdkDropList, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, AsyncPipe],
 })
 /**
  * Component displaying table rows for each value for a certain metadata field within a form
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 3bddba534d..fb765583b5 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,107 +1,135 @@
 
    
+  cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
+  [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
   
    
-    
    {{ mdValue.newValue.value }}
    
-    
-    
-    
-    
-    
-    
    
+    }
+    @if (mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))) {
+      
+    }
+    @if (mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing) {
+      
+      
+    }
+    @if (mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))) {
+      
+      
+    }
+    @if (mdValue.editing && ((isScrollableVocabulary() | async) || (isHierarchicalVocabulary() | async))) {
+      
-    
    
-      
-        
-        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
-      
-    
    
-    
    
-      
    
-        
-        
-        
-        
+        
+        {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
+      
+    }
+    @if (!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE) {
+      
    
+        
+          
+          {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
+        
       
    
-    
    
-    
    
-      {{ mdRepresentationName$ | async }}
-      
-    
    
+    }
+    @if ( mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)) {
+      
    
+        
    
+          
+          
+          @if (!editingAuthority) {
+            
+          }
+          @if (editingAuthority) {
+            
+          }
+        
    
+      
    
+    }
+    @if (mdRepresentation) {
+      
    
+        {{ mdRepresentationName$ | async }}
+        
+      
    
+    }
   
    
   
    
-    
    {{ mdValue.newValue.language }}
    
-    
+    @if (!mdValue.editing) {
+      
    {{ mdValue.newValue.language }}
    
+    }
+    @if (mdValue.editing) {
+      
+    }
   
    
   
    
     
    
       
    
         
    
-          
-          
+          @if (!mdValue.editing) {
+            
+          }
+          @if (mdValue.editing) {
+            
+          }
           
           
           
         
    
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index 4b79ae303c..e718080eb6 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -5,7 +5,6 @@ import {
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -95,7 +94,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
+  imports: [VarDirective, CdkDrag, NgClass, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 53ebd02491..e8dfce3a7b 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,102 +1,120 @@
-
    
-  
    
-    
-    
+      @if (isReinstatable) {
+        
+      }
+      
+      @if (!isReinstatable) {
+        
+      }
+    
    
+    
    
+      
+      @if (form.newValue) {
+        
    
+          
    
+            
+            
+          
    
+          
    
+            
    
+              
+              
+              
+            
    
+          
    
+        
    
+      }
+      @for (mdField of form.fieldKeys; track mdField) {
+        
    
+          
    
+            {{ mdField }}
+            @if (form.hasOrderChanges(mdField)) {
+              
    
+                {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
+              
    
+            }
+          
    
+          
+          
+        
    
+      }
+    
    
+    @if (isEmpty && !form.newValue) {
+      
    
+        
+      
    
+    }
+    
    
+      
    
+        @if (isReinstatable) {
+          
-    
-    
+        }
+        
+        @if (!isReinstatable) {
+          
-  
    
-
-  
    
-    
-    
    
-      
    
-        
-        
-      
    
-      
    
-        
    
-          
-          
-          
-        
    
+            (click)="discard()">
+             {{ dsoType + '.edit.metadata.discard-button' | translate }}
+          
+        }
       
    
     
    
-    
    
-      
    
-        {{ mdField }}
-        
    
-          {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
-        
    
-      
    
-      
-      
-    
    
   
    
-
-  
    
-    
-  
    
-  
    
-    
    
-      
-      
-      
-    
    
-  
    
-
    
-
+}
+@if (!form) {
+  
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 4a40e3c26a..31d44928e9 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -67,7 +63,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index a82f31b953..20cf35aabc 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -1,15 +1,17 @@
 
    
   
-  
    {{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}
    
+    class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
+    [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
+    [value]="mdField"
+    [formControl]="input"
+    (focusin)="query$.next(mdField)"
+    (dsClickOutside)="query$.next(null)"
+    (click)="$event.stopPropagation();"
+    (keyup)="this.selectedValueLoading = false"
+    />
+  @if (showInvalid) {
+    
    {{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}
    
+  }
   
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index abdf2f14d8..65bd8bfa7b 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   AfterViewInit,
@@ -62,7 +60,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
+  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
 })
 /**
  * Component displaying a searchable input for metadata-fields
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index e62da86922..786e3b5466 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -3,42 +3,54 @@
     
    
       
     
    
-    
-      
    
-        
-        
-      
    
-        
-    
-            
    
-                
-                
-            
    
-            
+    @if (linkType !== linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
+    @if (linkType === linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
     
    
-      
+      @if (showLabel) {
+        
+      }
       
         
    
           
-      
    
-        
-          
-        
-      
    
-      
    
-        
-          
-        
-      
    
-      
    
-        {{ 'search.results.view-result' | translate}}
-      
    
+      @if (dso.hasMetadata('creativework.datePublished')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (dso.hasMetadata('journal.title')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (linkType !== linkTypes.None) {
+        
    
+          {{ 'search.results.view-result' | translate}}
+        
    
+      }
     
    
   
   
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
index ce56496198..61c1e5d80e 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-issue-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 7e0ab3f9e3..22903638d3 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -3,42 +3,54 @@
     
    
       
     
    
-    
-      
    
-        
-        
-      
    
-        
-    
-                
    
-                    
-                    
-                
    
-                
+    @if (linkType !== linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
+    @if (linkType === linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
     
    
-      
+      @if (showLabel) {
+        
+      }
       
         
    
           
-      
    
-        
-          
-        
-      
    
-      
    
-        
-          
-        
-      
    
-      
    
-        {{ 'search.results.view-result' | translate}}
-      
    
+      @if (dso.hasMetadata('creativework.datePublished')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (dso.hasMetadata('dc.description')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (linkType !== linkTypes.None) {
+        
    
+          {{ 'search.results.view-result' | translate}}
+        
    
+      }
     
    
   
   
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
index 4fcc8ade5d..001c06186d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-volume-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index a157089b02..18a5ffc5cc 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -3,46 +3,60 @@
     
    
       
     
    
-    
-      
    
-        
-        
-      
    
-        
-    
-            
    
-                
-                
-            
    
-            
+    @if (linkType !== linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
+    @if (linkType === linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
     
    
-      
+      @if (showLabel) {
+        
+      }
       
         
    
           
-      
    
-        
-          {{firstMetadataValue('creativework.editor')}}
-          
-            , 
-            {{firstMetadataValue('creativework.publisher')}}
-          
-        
-      
    
-      
    
-        
-          
-        
-      
    
-      
    
-        {{ 'search.results.view-result' | translate}}
-      
    
+      @if (dso.hasMetadata('creativework.editor')) {
+        
    
+          
+            {{firstMetadataValue('creativework.editor')}}
+            @if (dso.hasMetadata('creativework.publisher')) {
+              
+                , 
+                {{firstMetadataValue('creativework.publisher')}}
+              
+            }
+          
+        
    
+      }
+      @if (dso.hasMetadata('dc.description')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (linkType !== linkTypes.None) {
+        
    
+          {{ 'search.results.view-result' | translate}}
+        
    
+      }
     
    
   
   
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
index 38a7cf3210..72fb8dadb4 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 961cbfd8c4..1807147bdb 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,42 +1,68 @@
 
    
-  
    
-    
-      
-      
-    
-      
-      
-      
-    
-  
    
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
+        
+      }
+    
    
+  }
   
    
-    
+    @if (showLabel) {
+      
+    }
     
-      
-      
+      @if (linkType !== linkTypes.None) {
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+      }
       
         
-          
-            
-              ; 
-            
-            
-              
-                 - ; 
+          @if (dso.allMetadata(['publicationvolume.volumeNumber']).length > 0) {
+            
+              @for (value of allMetadataValues(['publicationvolume.volumeNumber']); track value; let last = $last) {
+                
+                  @if (!last) {
+                  ; 
+                }
               
-            
+            }
+            @if (dso.allMetadata(['publicationissue.issueNumber']).length > 0) {
+              
+                @for (value of allMetadataValues(['publicationissue.issueNumber']); track value; let first = $first; let last = $last) {
+                  
+                    @if (first) {
+                       - 
+                      }@if (!last) {
+                      ; 
+                    }
+                  
+                }
+              
+            }
           
-        
-      
-    
-  
    
+        }
+      
+    
+  
+
    
 
    
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index f3f8d79809..7ce5ac9df1 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
   templateUrl: './journal-issue-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index b161874fdf..a153592638 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,42 +1,66 @@
 
    
-  
    
-    
-      
-      
-    
-      
-      
-      
-    
-  
    
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
+        
+      }
+    
    
+  }
   
    
-    
+    @if (showLabel) {
+      
+    }
     
-      
-      
+      @if (linkType !== linkTypes.None) {
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+      }
       
-    
-            
-                    
-                        ; 
-                    
+        
+          @if (dso.allMetadata(['journal.title']).length > 0) {
+            
+              @for (value of allMetadataValues(['journal.title']); track value; let last = $last) {
+                
+                  @if (!last) {
+                  ; 
+                }
+              
+            }
+          
+        }
+        @if (dso.allMetadata(['publicationvolume.volumeNumber']).length > 0) {
+          
+            @for (value of allMetadataValues(['publicationvolume.volumeNumber']); track value; let last = $last) {
+              
+                 ()@if (!last) {
+                ;
+              }
             
-            
-                    
-                         ();
-                    
-            
-        
+          }
+        
+      }
+    
   
-    
-  
    
+
+
    
 
    
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index 4aee64c4f5..f01c859fdd 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
   templateUrl: './journal-volume-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 8acdfed9b5..c74b01934a 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,34 +1,52 @@
 
    
-  
    
-    
-      
-      
-    
-      
-      
-      
-    
-  
    
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
+        
+      }
+    
    
+  }
   
    
-    
+    @if (showLabel) {
+      
+    }
     
-      
-      
+      @if (linkType !== linkTypes.None) {
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+      }
       
-    
-            
-                    
-                        ; 
-                    
-            
-        
-  
-    
-  
    
+        
+          @if (dso.allMetadata(['creativeworkseries.issn']).length > 0) {
+            
+              @for (value of allMetadataValues(['creativeworkseries.issn']); track value; let last = $last) {
+                
+                  @if (!last) {
+                  ; 
+                }
+              
+            }
+          
+        }
+      
+    
+  
+
    
 
    
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 8ef14120e0..f589e2ffc5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-search-result-list-element.component.scss'],
   templateUrl: './journal-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
index c0400d97fa..919d712c32 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-journal-issue-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
index 2275c23a4d..d9ec174b16 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-journal-volume-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
index 077d2ee390..2c17494f87 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-journal-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 9469dcc7b5..a693891ae6 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,4 +1,6 @@
-
+@if (showBackButton$ | async) {
+  
+}
 
    
   
   
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index ca6bb56e79..ed52174054 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal-issue.component.scss'],
   templateUrl: './journal-issue.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index ff8811b4a6..13c8e12939 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,4 +1,6 @@
-
+@if (showBackButton$ | async) {
+  
+}
 
    
   
   
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index fab0e105be..81764dd3ee 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal-volume.component.scss'],
   templateUrl: './journal-volume.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index b5a09a842f..ddd15b5573 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,4 +1,6 @@
-
+@if (showBackButton$ | async) {
+  
+}
 
    
   
   
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 179355d869..7e3dc40c1e 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal.component.scss'],
   templateUrl: './journal.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 95c3ae70f2..2836fbfbe1 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -3,48 +3,62 @@
     
    
       
     
    
-    
-      
    
-        
-        
-      
    
-        
-    
-            
    
-                
-                
-            
    
-            
+    @if (linkType !== linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
+    @if (linkType === linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
     
    
-      
+      @if (showLabel) {
+        
+      }
       
         
    
           
-      
    
-        
-          
-        
-      
    
-      
    
-        
-          
+          
+            
+          
+        
    
+      }
+      @if (dso.hasMetadata('organization.address.addressCountry')) {
+        
    
+          
+            {{firstMetadataValue('organization.address.addressCountry')}}
-          
-            , 
-            {{firstMetadataValue('organization.address.addressLocality')}}
-          
-        
-      
    
-      
    
-        {{ 'search.results.view-result' | translate}}
-      
    
+            @if (dso.hasMetadata('organization.address.addressLocality')) {
+              
+                , 
+                {{firstMetadataValue('organization.address.addressLocality')}}
+              
+            }
+          
+        
    
+      }
+      @if (linkType !== linkTypes.None) {
+        
    
+          {{ 'search.results.view-result' | translate}}
+        
    
+      }
     
    
   
   
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
index 6b4dd0e21d..ae681a3129 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './org-unit-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 7d8ea40f38..f3613a8637 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -3,41 +3,53 @@
     
    
       
     
    
-    
-      
    
-        
-        
-      
    
-        
-    
-            
    
-                
-                
-            
    
-            
+    @if (linkType !== linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
+    @if (linkType === linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
     
    
-      
+      @if (showLabel) {
+        
+      }
       
         
    
           
-      
-      
    
-        
-          
-        
-      
    
-      
    
-        {{ 'search.results.view-result' | translate}}
-      
    
+      @if (dso.hasMetadata('person.email')) {
+        
+      }
+      @if (dso.hasMetadata('person.jobTitle')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (linkType !== linkTypes.None) {
+        
    
+          {{ 'search.results.view-result' | translate}}
+        
    
+      }
     
    
   
   
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
index dc9b1f8f47..aaa0434c02 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './person-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index cc9c7f6f35..0c266c09dc 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -3,36 +3,46 @@
     
    
       
     
    
-    
-      
    
-        
-        
-      
    
-        
-    
-      
    
-        
-        
-      
    
-        
+    @if (linkType !== linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
+    @if (linkType === linkTypes.None) {
+      
+        
    
+          
+          
+        
    
+          
+    }
     
    
-      
+      @if (showLabel) {
+        
+      }
       
         
    
           
-      
    
-        
-          
-        
-      
    
-      
    
-        {{ 'search.results.view-result' | translate}}
-      
    
+      @if (dso.hasMetadata('dc.description')) {
+        
    
+          
+            
+          
+        
    
+      }
+      @if (linkType !== linkTypes.None) {
+        
    
+          {{ 'search.results.view-result' | translate}}
+        
    
+      }
     
    
   
   
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
index 0ba8ce6f75..77f67f5756 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './project-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 91b694c072..6c6218dc43 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,40 +1,54 @@
 
    
-    
    
-        
-            
-            
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
         
-        
-            
-            
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
         
+      }
     
    
-    
    
-        
-        
-            
-            
-            
-      
+    @if (showLabel) {
+      
+    }
+    
+      @if (linkType !== linkTypes.None) {
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+      }
+      
+        @if (dso.allMetadata(['dc.description']).length > 0) {
+          
             
-            
-      
-  
-        
-    
    
+            [innerHTML]="firstMetadataValue('dc.description')">
+          
+        
+      }
+    
+  
+
    
 
    
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index 9fb88d0eac..47cbefd4f5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./org-unit-search-result-list-element.component.scss'],
   templateUrl: './org-unit-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index cc7905e719..b625212240 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,42 +1,58 @@
 
    
-  
    
-    
-      
-      
-    
-    
-      
-      
-    
-  
    
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
+        
+      }
+    
    
+  }
   
    
-    
+    @if (showLabel) {
+      
+    }
     
-      
-      
+      @if (linkType !== linkTypes.None) {
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+      }
       
-    
-            
-                    
-                        
-                    
+        
+          @if (dso.allMetadata(['person.jobTitle']).length > 0) {
+            
+              @for (value of allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+                
+                  
+                
+              }
             
+          }
         
-  
+      
     
   
    
 
    
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 86ead8b825..870d3222b5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -32,7 +30,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./person-search-result-list-element.component.scss'],
   templateUrl: './person-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 65cf6fa1f8..294f3d909c 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,42 +1,54 @@
 
    
-  
    
-    
-      
-      
-    
-    
-      
-      
-    
-  
    
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
+        
+      }
+    
    
+  }
   
    
     
-      
-      
-      
+      @if (showLabel) {
+        
+      }
+      @if (linkType !== linkTypes.None) {
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+      }
       
       
       
       
       
       
-      
-      
-      
-      
-    
-  
    
+    
+  
+
+
+
+
    
 
    
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index 825f7be387..dd8f6acb44 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -19,7 +18,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./project-search-result-list-element.component.scss'],
   templateUrl: './project-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, TruncatableComponent, ThemedBadgesComponent, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, TruncatableComponent, ThemedBadgesComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
index 54885c4b86..9d41175ecd 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-org-unit-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
index 81739063e8..5a115f74de 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -29,7 +28,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-person-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
index f3e2881bed..3002f3b283 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-project-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 80cf2c11be..36ec0e48c0 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,4 +1,6 @@
-
+@if (showBackButton$ | async) {
+  
+}
 
    
   
   
@@ -8,10 +10,10 @@
   
    
     
       
+        [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+        [alt]="'thumbnail.orgunit.alt'"
+        [placeholder]="'thumbnail.orgunit.placeholder'"
+        >
       
     
     
+      >
     
     
+@if (showBackButton$ | async) {
+  
+}
 
    
   
   
@@ -8,9 +10,9 @@
   
    
     
       
+        [defaultImage]="'assets/images/person-placeholder.svg'"
+        [alt]="'thumbnail.person.alt'"
+        [placeholder]="'thumbnail.person.placeholder'">
       
     
     
+@if (showBackButton$ | async) {
+  
+}
 
    
   
   
@@ -15,56 +17,56 @@
       
     
     
-      
-      
-    
-    
-    
-    
-    
-    
-    
-    
-      
-      
-    
-  
    
-  
    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
    
+
    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
    
+
    
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index b654f5e17c..d5d33919a9 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./project.component.scss'],
   templateUrl: './project.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Project
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index cbc68ef7cf..edb3aa7834 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -1,20 +1,27 @@
 
   
-      
-              
-                  ; 
-              
-      
-  
+    @if (mdRepresentation.allMetadata(['person.jobTitle']).length > 0) {
+      
+        @for (value of mdRepresentation.allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+          
+            @if (!last) {
+            ; 
+          }
+        
+      }
+    
+  }
+
 
 
   
-  
-  
+    [innerHTML]="mdRepresentation.getValue()"
+  [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null">
+  @if (mdRepresentation.firstMetadata('person.identifier.orcid')) {
+    
+    
+  }
 
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index c7b9e1a333..82e5f54ebb 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -14,7 +11,7 @@ import { TruncatableComponent } from '../../../../shared/truncatable/truncatable
   selector: 'ds-person-item-metadata-list-element',
   templateUrl: './person-item-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
+  imports: [TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
index 9d4a3566ad..78c86ae639 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
@@ -1,4 +1,6 @@
 
    
   
    {{object.display}}
    
-  
+  @if (uri) {
+    
+  }
 
    
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
index d7c5b8aafd..c9eea61118 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -19,7 +19,7 @@ import { AbstractListableElementComponent } from '../../../../../shared/object-c
   styleUrls: ['./external-source-entry-list-submission-element.component.scss'],
   templateUrl: './external-source-entry-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 /**
  * The component for displaying a list element of an external source entry
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index 6b9a775391..90ec0261e2 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -1,22 +1,32 @@
 
    
-
-
+  
+  
 
-    
    
-        
+
    
+  @if (useNameVariants) {
+    
+  }
 
-      
    
+  @if (!useNameVariants) {
+    
    
+  }
 
-        
-        
-                    , 
-        
-        
-                    
-        
-        
-    
    
+  
+    @if (dso.allMetadata('organization.address.addressLocality').length > 0) {
+      
+        @if (dso.allMetadata('organization.address.addressCountry').length > 0) {
+        , 
+      }
+    
+  }
+  @if (dso.allMetadata('organization.address.addressCountry').length > 0) {
+    
+      
+    
+  }
+
+
    
 
    
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index cff764d744..e08f917fe9 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -37,7 +37,7 @@ import { OrgUnitInputSuggestionsComponent } from './org-unit-suggestions/org-uni
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf, OrgUnitInputSuggestionsComponent, FormsModule],
+  imports: [OrgUnitInputSuggestionsComponent, FormsModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index 58f39b8d0b..45a4dc9bb3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -1,26 +1,28 @@
 
    
-    
-    
-    
    
-        
    
-            
    
-                
-                    
-                
-            
    
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  
+  
+  
    
+    
    
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        
+      }
     
    
+  
    
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
index 073a7aacce..6896da5783 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -33,7 +32,7 @@ import { DebounceDirective } from '../../../../../../shared/utils/debounce.direc
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 122c8bb59e..cc6e09ab7f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,36 +1,48 @@
 
    
-  
    
-    
-      
-      
-    
-    
-      
-      
-    
-  
    
+  @if (showThumbnails) {
+    
    
+      @if (linkType !== linkTypes.None) {
+        
+          
+          
+        
+      }
+      @if (linkType === linkTypes.None) {
+        
+          
+          
+        
+      }
+    
    
+  }
   
    
     
    
       
    
         
+          (clickSuggestion)="select($event)"
+        (submitSuggestion)="selectCustom($event)">
         
-          
-                  
-                      ; 
-                  
+          @if (dso.allMetadata(['person.jobTitle']).length > 0) {
+            
+              @for (value of allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+                
+                  @if (!last) {
+                  ; 
+                }
+              
+            }
           
-        
-      
    
+        }
+      
     
    
   
    
 
    
+
    
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 1145fb78e3..f5973408f6 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -39,7 +37,7 @@ import { PersonInputSuggestionsComponent } from './person-suggestions/person-inp
   styleUrls: ['./person-search-result-list-submission-element.component.scss'],
   templateUrl: './person-search-result-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedThumbnailComponent, NgClass, PersonInputSuggestionsComponent, FormsModule, NgFor, AsyncPipe],
+  imports: [ThemedThumbnailComponent, NgClass, PersonInputSuggestionsComponent, FormsModule, AsyncPipe],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index 53260ceaa3..e2bdaab5a4 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -1,27 +1,29 @@
 
    
-    
-    
-    
    
-        
    
-            
    
-                
-                    
-                
-            
    
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  
+  
+  
    
+    
    
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        
+      }
     
    
+  
    
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index 0058789811..b5645ff3f1 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -33,7 +32,7 @@ import { DebounceDirective } from '../../../../../../shared/utils/debounce.direc
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 5bac874479..bd18fc2a37 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,55 +1,51 @@
 
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index 6a6e5e94d7..c691203c02 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -31,7 +30,7 @@ import { hasValue } from '../shared/empty.util';
   styleUrls: ['footer.component.scss'],
   templateUrl: 'footer.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule],
+  imports: [RouterLink, AsyncPipe, DatePipe, TranslateModule],
 })
 export class FooterComponent implements OnInit {
   dateObj: number = Date.now();
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index f8cad64fd5..59ce7311f8 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -1,36 +1,35 @@
-
    
+@if ((registration$ |async)) {
+  
    
     
    {{'forgot-password.form.head' | translate}}
    
     
    
-        
    {{'forgot-password.form.identification.header' | translate}}
    
-        
    
-            
    
-                
    
-                    {{'forgot-password.form.identification.email' | translate}} 
-                    {{(registration$ |async).email}}
-                
    
-            
    
+      
    {{'forgot-password.form.identification.header' | translate}}
    
+      
    
+        
    
+          
    
+            {{'forgot-password.form.identification.email' | translate}} 
+            {{(registration$ |async).email}}
+          
    
         
    
+      
    
     
    
-
     
    
-        
    {{'forgot-password.form.card.security' | translate}}
    
-        
    
-
-            
-        
    
+      
    {{'forgot-password.form.card.security' | translate}}
    
+      
    
+        
+      
    
     
    
-
     
    
-        
    
-            
-        
    
+      
    
+        
+      
    
     
    
-
    
+  
    
+}
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 68f0f9d203..37d964084a 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -42,7 +39,6 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     BrowserOnlyPipe,
     ProfilePageSecurityFormComponent,
     AsyncPipe,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
index 6f04326d56..f815312739 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.html
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -1,10 +1,12 @@
-
+@if (buttonVisible$ | async) {
+  
    
+    
+      
+    
+  
    
+}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 8ef0d107e0..84eeb4013b 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -25,7 +22,7 @@ import { ContextHelpService } from '../../shared/context-help.service';
   templateUrl: './context-help-toggle.component.html',
   styleUrls: ['./context-help-toggle.component.scss'],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class ContextHelpToggleComponent implements OnInit {
   buttonVisible$: Observable;
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 80873e7ede..67a4a96c23 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -11,13 +11,15 @@
         
         
         
-        
    
-          
-        
    
+        @if (isMobile$ | async) {
+          
    
+            
+          
    
+        }
       
     
    
   
    
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 25e3b55766..48fad0b56b 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,7 @@ import { ContextHelpToggleComponent } from './context-help-toggle/context-help-t
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
   standalone: true,
-  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent implements OnInit {
   /**
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index 073f194f7b..f15d8f17b1 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -1,27 +1,35 @@
-
    
-  
    
-    
    
-      
-      
    
-        
-        
-      
    
-    
    
-    
    
-      
    
-        
    
-          
+@for (entry of healthInfoComponent | dsObjNgFor; track entry) {
+  
    
+    @if (entry && !isPlainProperty(entry.value)) {
+      
    
+        
    
+          
+          
    
+            @if (collapse.collapsed) {
+              
+            }
+            @if (!collapse.collapsed) {
+              
+            }
+          
    
+        
    
+        
    
+          
    
+            
    
+              
+            
    
+          
    
         
    
       
    
-    
    
+    }
+    @if (entry && isPlainProperty(entry.value)) {
+      
     {{ getPropertyLabel(entry.key) | titlecase }} : {{entry.value}}
    
+    }
   
    
-  
-    
     {{ getPropertyLabel(entry.key) | titlecase }} : {{entry.value}}
    
-      
-
    
+}
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
index 5c65586327..531efe6059 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,7 +17,7 @@ import { HealthInfoComponent } from '../../models/health-component.model';
   templateUrl: './health-info-component.component.html',
   styleUrls: ['./health-info-component.component.scss'],
   standalone: true,
-  imports: [NgFor, NgIf, NgbCollapseModule, TitleCasePipe, ObjNgFor],
+  imports: [NgbCollapseModule, TitleCasePipe, ObjNgFor],
 })
 export class HealthInfoComponentComponent extends HealthComponentComponent {
 
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index e8d1bfb56c..432570cef0 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -1,22 +1,24 @@
-
+@if (healthInfoResponse) {
   
-    
-      
-        
    
-          
-          
    
-            
+    @for (entry of healthInfoResponse | dsObjNgFor; track entry) {
+      
+        
+          
    
+            
+            
    
+              
+            
    
           
    
-        
    
-      
-      
-        
-        
-      
-    
+        
+        
+          
+          
+        
+      
+    }
   
-
+}
diff --git a/src/app/health-page/health-info/health-info.component.ts b/src/app/health-page/health-info/health-info.component.ts
index fe795104e8..3e6f7714ff 100644
--- a/src/app/health-page/health-info/health-info.component.ts
+++ b/src/app/health-page/health-info/health-info.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -28,7 +24,7 @@ import { HealthInfoComponentComponent } from './health-info-component/health-inf
   templateUrl: './health-info.component.html',
   styleUrls: ['./health-info.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbAccordionModule, NgFor, HealthStatusComponent, HealthInfoComponentComponent, TitleCasePipe, ObjNgFor],
+  imports: [NgbAccordionModule, HealthStatusComponent, HealthInfoComponentComponent, TitleCasePipe, ObjNgFor],
 })
 export class HealthInfoComponent implements OnInit  {
 
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 797ca0bc6e..10e34b392a 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,27 +1,33 @@
-
    
-  
    {{'health-page.heading' | translate}}
    
-  
    
-    
-    
    
+@if ((healthResponseInitialised | async) && (healthInfoResponseInitialised | async)) {
+  
    
+    
    {{'health-page.heading' | translate}}
    
+    @if ((healthResponse | async) && (healthInfoResponse | async)) {
+      
+    }
+    @if ((healthResponse | async) === null || (healthInfoResponse | async) === null) {
+      
+    }
   
    
-  
-
    
+}
 
 
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index 778e63ed50..d1c322bff2 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,7 @@ import {
   templateUrl: './health-page.component.html',
   styleUrls: ['./health-page.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbNavModule, HealthPanelComponent, HealthInfoComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [NgbNavModule, HealthPanelComponent, HealthInfoComponent, AlertComponent, AsyncPipe, TranslateModule],
 })
 export class HealthPageComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index 55e11ed6ad..37dedd7b98 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -1,30 +1,38 @@
-
-  
    
-    
    
-      
-      
    
-        
-        
+@if (healthComponent?.components) {
+  @for (entry of healthComponent?.components | dsObjNgFor; track entry) {
+    
    
+      
    
+        
+        
    
+          @if (collapse.collapsed) {
+            
+          }
+          @if (!collapse.collapsed) {
+            
+          }
+        
    
       
    
-    
    
-    
    
-      
    
-        
    
-          
+      
    
+        
    
+          
    
+            
+          
    
         
    
       
    
     
    
-  
    
-
-
-  
    
-    
    {{ getPropertyLabel(item.key) | titlecase }} : {{item.value}}
    
-  
    
-    
-
+  }
+}
+@if (healthComponent?.details) {
+  @for (item of healthComponent?.details | dsObjNgFor; track item) {
+    
    
+      
    {{ getPropertyLabel(item.key) | titlecase }} : {{item.value}}
    
+    
    
+  }
+}
+@if (!healthComponent?.details && !healthComponent?.components) {
   
-    
+}
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.ts b/src/app/health-page/health-panel/health-component/health-component.component.ts
index 769f5b545b..a7ec69d06f 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -27,7 +23,7 @@ import { HealthComponent } from '../../models/health-component.model';
   templateUrl: './health-component.component.html',
   styleUrls: ['./health-component.component.scss'],
   standalone: true,
-  imports: [NgIf, NgFor, NgbCollapseModule, AlertComponent, TitleCasePipe, ObjNgFor],
+  imports: [NgbCollapseModule, AlertComponent, TitleCasePipe, ObjNgFor],
 })
 export class HealthComponentComponent {
 
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index 169cb05575..50caff35dd 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -3,22 +3,24 @@
   
 
    
 
-  
-    
-      
    
-        
-        
    
-          
+  @for (entry of healthResponse.components | dsObjNgFor; track entry) {
+    
+      
+        
    
+          
+          
    
+            
+          
    
         
    
-      
    
-    
-    
-      
-      
-    
-  
+      
+      
+        
+        
+      
+    
+  }
 
diff --git a/src/app/health-page/health-panel/health-panel.component.ts b/src/app/health-page/health-panel/health-panel.component.ts
index 3d72f6b6b7..d1b233df64 100644
--- a/src/app/health-page/health-panel/health-panel.component.ts
+++ b/src/app/health-page/health-panel/health-panel.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -27,7 +23,7 @@ import { HealthStatusComponent } from './health-status/health-status.component';
   templateUrl: './health-panel.component.html',
   styleUrls: ['./health-panel.component.scss'],
   standalone: true,
-  imports: [HealthStatusComponent, NgbAccordionModule, NgFor, NgIf, HealthComponentComponent, TitleCasePipe, ObjNgFor, TranslateModule],
+  imports: [HealthStatusComponent, NgbAccordionModule, HealthComponentComponent, TitleCasePipe, ObjNgFor, TranslateModule],
 })
 export class HealthPanelComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index ee1dabc2de..6e6a8ea190 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,18 @@
-
-  
-  
-  
 
-
+@switch (status) {
+  @case (HealthStatus.UP) {
+    
+  }
+  @case (HealthStatus.UP_WITH_ISSUES) {
+    
+  }
+  @case (HealthStatus.DOWN) {
+    
+  }
+}
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.ts b/src/app/health-page/health-panel/health-status/health-status.component.ts
index 1a1c15bf0b..050dd2c621 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -19,7 +16,7 @@ import { HealthStatus } from '../../models/health-component.model';
   templateUrl: './health-status.component.html',
   styleUrls: ['./health-status.component.scss'],
   standalone: true,
-  imports: [NgSwitch, NgSwitchCase, NgbTooltipModule, TranslateModule],
+  imports: [NgbTooltipModule, TranslateModule],
 })
 export class HealthStatusComponent {
   /**
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index ad48fb328c..43f7977bf2 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,25 +1,31 @@
 
 
-
-  
-
-
    
-  
-
    
+@if (showDiscoverFilters) {
+  
+    
+  
+}
+@if (!showDiscoverFilters) {
+  
    
+    
+  
    
+}
 
 
 
-  
+  @if ((site$ | async); as site) {
     
-  
+  }
   
+    [searchPlaceholder]="'home.search-form.placeholder' | translate">
   
   
-  
+  @if (recentSubmissionspageSize>0) {
+    
+  }
 
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index c954e90402..33a8216a8a 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -34,7 +33,7 @@ import { ThemedTopLevelCommunityListComponent } from './top-level-community-list
   styleUrls: ['./home-page.component.scss'],
   templateUrl: './home-page.component.html',
   standalone: true,
-  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
+  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
 })
 export class HomePageComponent implements OnInit {
 
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index 7bf89b232f..4d77e5027e 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -1,14 +1,22 @@
 
-        
    
-                
    
-                
     {{'home.recent-submissions.head' | translate}}
    
-                
    
-                        
-                        
-                
    
-                
+  @if (itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0) {
+    
    
+      
    
+      
     {{'home.recent-submissions.head' | translate}}
    
+      @for (item of itemRD?.payload?.page; track item) {
+        
    
+          
+          
         
    
-        
-        
-        
+      }
+      
+    
    
+  }
+  @if (itemRD?.hasFailed) {
+    
+  }
+  @if (!itemRD || itemRD.isLoading) {
+    
+    
+  }
 
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index c7383dd883..b336cf7e9b 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   isPlatformBrowser,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -61,7 +59,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgIf, NgClass, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgClass, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class RecentItemListComponent implements OnInit, OnDestroy {
   itemRD$: Observable>>;
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index 2a4325428f..00446d658a 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -1,15 +1,21 @@
 
-  
    
-    
    
-      {{'home.top-level-communities.head' | translate}}
-    
    
-  
    {{'home.top-level-communities.help' | translate}}
    
-  
-  
-
    
-
-    
+  @if (communitiesRD?.hasSucceeded ) {
+    
    
+      
    
+        {{'home.top-level-communities.head' | translate}}
+      
    
+      
    {{'home.top-level-communities.help' | translate}}
    
+      
+      
+    
    
+  }
+  @if (communitiesRD?.hasFailed ) {
+    
+  }
+  @if (communitiesRD?.isLoading ) {
+    
+  }
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index c562d38ff2..4af7bcc483 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -48,7 +45,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut],
   standalone: true,
-  imports: [VarDirective, NgIf, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 7909c02272..a1ee88df3b 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -11,12 +11,18 @@
         
    
       
    
 
-      
    
-        
    
-          
-          
+      @if (feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)) {
+        
    
+          
    
+            @if (feedbackForm.controls.email.errors?.required) {
+              
+            }
+            @if (feedbackForm.controls.email.errors?.pattern) {
+              
+            }
+          
    
         
    
-      
    
+      }
 
       
    
         
    
@@ -25,11 +31,15 @@
         
    
       
    
 
-      
    
-        
    
-          
+      @if (feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)) {
+        
    
+          
    
+            @if (feedbackForm.controls.message.errors?.required) {
+              
+            }
+          
    
         
    
-      
    
+      }
 
       
    
         
    
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index db98a2ee01..fd7bb09eb8 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -39,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index b964327e39..cb69f873bb 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -1,16 +1,22 @@
 
    
-    
    
-        
+  @if (item && !item.isDiscoverable) {
+    
    
+      
     
    
-    
    
-        
-            
    
-                {{'item.alerts.withdrawn' | translate}}
-                
    
-                  {{"404.link.home-page" | translate}}
-                  {{ 'item.alerts.reinstate-request' | translate}}
-                
    
-            
    
-            
+  }
+  @if (item && item.isWithdrawn) {
+    
    
+      
+        
    
+          {{'item.alerts.withdrawn' | translate}}
+          
    
+            {{"404.link.home-page" | translate}}
+            @if (showReinstateButton$ | async) {
+              {{ 'item.alerts.reinstate-request' | translate}}
+            }
+          
    
+        
    
+          
     
    
+  }
 
    
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index bcf940e69d..3dbe0f2562 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -37,7 +34,6 @@ import {
   styleUrls: ['./item-alerts.component.scss'],
   imports: [
     AlertComponent,
-    NgIf,
     TranslateModule,
     RouterLink,
     AsyncPipe,
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index dde13db9a6..4e40883602 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,87 +1,101 @@
 
    
-    
    {{'bitstream-request-a-copy.header' | translate}}
    
-    
    
-        {{'bitstream-request-a-copy.alert.canDownload1' | translate}}
-        {{'bitstream-request-a-copy.alert.canDownload2'| translate}}
+  
    {{'bitstream-request-a-copy.header' | translate}}
    
+  @if (canDownload$|async) {
+    
    
+      {{'bitstream-request-a-copy.alert.canDownload1' | translate}}
+      {{'bitstream-request-a-copy.alert.canDownload2'| translate}}
     
    
-    
    
-        
    {{'bitstream-request-a-copy.intro' | translate}} {{itemName}}
    
-        
    {{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}
    
-        
    {{'bitstream-request-a-copy.intro.bitstream.all' | translate}}
    
-    
    
-    
    
+  }
+  
    
+    
    {{'bitstream-request-a-copy.intro' | translate}} {{itemName}}
    
+    @if (bitstream !== undefined && allfiles.value === 'false') {
+      
    {{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}
    
+    }
+    @if (allfiles.value === 'true') {
+      
    {{'bitstream-request-a-copy.intro.bitstream.all' | translate}}
    
+    }
+  
    
+  
 
-        
    
-            
    
-                
    
-                    
-                    
-                    
    
-                    
-                        {{ 'bitstream-request-a-copy.name.error' | translate }}
-                    
-                    
    
-                
    
-            
    
-            
    
-                
    
-                    
-                    
-                    
    
-                    
-                        {{ 'bitstream-request-a-copy.email.error' | translate }}
-                    
-                    
    
-                    {{'bitstream-request-a-copy.email.hint' |translate}}
-                
    
-            
    
-            
    
-                
    
-                    
    {{'bitstream-request-a-copy.allfiles.label' |translate}}
    
-                    
    
-                        
-                        
-                    
    
-                    
    
-                        
-                        
-                    
    
-                
    
-            
    
-            
    
-                
    
-                    
-                    
-                
    
+    
    
+      
    
+        
    
+          
+          
+          @if (name.invalid && (name.dirty || name.touched)) {
+            
    
+              @if (name.errors && name.errors.required) {
+                
+                  {{ 'bitstream-request-a-copy.name.error' | translate }}
+                
+              }
             
    
+          }
         
    
-    
+      
    
+      
    
+        
    
+          
+          
+          @if (email.invalid && (email.dirty || email.touched)) {
+            
    
+              @if (email.errors) {
+                
+                  {{ 'bitstream-request-a-copy.email.error' | translate }}
+                
+              }
+            
    
+          }
+          {{'bitstream-request-a-copy.email.hint' |translate}}
+        
    
+      
    
+      
    
+        
    
+          
    {{'bitstream-request-a-copy.allfiles.label' |translate}}
    
+          
    
+            
+            
+          
    
+          
    
+            
+            
+          
    
+        
    
+      
    
+      
    
+        
    
+          
+          
+        
    
+      
    
+    
    
+  
 
-    
    
+  
    
     
    
-        
    
+      
    
 
-            
-                 {{'bitstream-request-a-copy.return' | translate}}
-            
+        
+           {{'bitstream-request-a-copy.return' | translate}}
+        
 
-            
-        
    
+        
+      
    
     
    
-
    
+  
    
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 454725f2e6..dfbcef4111 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   Location,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -71,7 +70,6 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     RouterLink,
     AsyncPipe,
     ReactiveFormsModule,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index c055fdde68..a0f25a9d3c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -1,41 +1,47 @@
 
    
-  
+  @if (bundles) {
     
    
       
    
         
    {{'item.bitstreams.upload.title' | translate}}
    
         
-          
    
-            {{'item.bitstreams.upload.item' | translate}}
-            {{ dsoNameService.getName(item) }}
-          
    
+          @if (item) {
+            
    
+              {{'item.bitstreams.upload.item' | translate}}
+              {{ dsoNameService.getName(item) }}
+            
    
+          }
             
       
    
       
    
         
         
+          [suggestions]="bundles"
+          [placeholder]="'item.bitstreams.upload.bundle.placeholder' | translate"
+          [action]="getCurrentUrl()"
+          [name]="'bundle-select'"
+          [debounceTime]="50"
+          [(ngModel)]="selectedBundleName"
+          (typeSuggestion)="bundleNameChange()"
+          (clickSuggestion)="onClick($event)"
+          (click)="f.open()"
+          ngDefaultControl>
         
-        
-        
+        @if (!selectedBundleId && selectedBundleName?.length > 0) {
+          
+        }
+        @if (selectedBundleId) {
+          
+        }
         
       
    
     
    
-      
+  }
 
    
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
index e8b216aa52..00d0a9a420 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -62,7 +59,6 @@ import { getEntityEditRoute } from '../../item-page-routing-paths';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    NgIf,
     DsoInputSuggestionsComponent,
     FormsModule,
     UploaderComponent,
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index ecba905297..0d3907c431 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -1,38 +1,46 @@
 
    
-    
    
-        
    
-            
    {{'item.edit.head' | translate}}
    
-            
    
-              
-                
    
-                    
    
-                        
-                    
    
-                    
    
-                      
    
-                         {{'item.edit.return' | translate}}
-                      
    
-                    
    
-                
    
+  
    
+    
    
+      
    {{'item.edit.head' | translate}}
    
+      
    
+        @if (pages.length > 0) {
+          
+        }
+        
    
+          
    
+            
+          
    
+          
    
+            
    
+               {{'item.edit.return' | translate}}
             
    
+          
    
         
    
+      
    
     
    
+  
    
 
    
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts
index cd3e1ff215..64a32968e5 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -48,8 +46,6 @@ import { getItemPageRoute } from '../item-page-routing-paths';
   imports: [
     TranslateModule,
     NgClass,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     NgbTooltipModule,
     RouterLink,
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
index 782e24fa2d..1e862c344d 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
@@ -1,6 +1,7 @@
-
-
+@if (itemRD$ | async; as itemRD) {
+  
+  
+}
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
index 1a2fc7292b..926afad490 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,7 +18,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./item-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
index 7f121081f2..4aca189e16 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
@@ -3,10 +3,10 @@
   
   
-  
+  @for (bundle of (bundles$ | async); track bundle) {
     
     
-    
+    @if ((bundleBitstreamsMap.get(bundle.id)?.bitstreams | async)?.length > 0) {
       
    
         
    
           
    
         
    
-          
+          @for (bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async); track bitstream) {
             
-          
-          
    
-            
-          
    
+            [resourceName]="bitstream.name">
+          }
+          @if (!bundleBitstreamsMap.get(bundle.id).allBitstreamsLoaded) {
+            
    
+              
+            
    
+          }
         
    
       
    
-        
-      
-  
    
-    
-  
    
+    }
+  }
+  @if (!allBundlesLoaded) {
+    
    
+      
+    
    
+  }
 
    
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index 30d1fce2bc..6e700fd48e 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -65,10 +61,8 @@ interface BundleBitstreamsMapEntry {
     ResourcePoliciesComponent,
     NgbCollapseModule,
     TranslateModule,
-    NgForOf,
     NgForTrackByIdDirective,
     AsyncPipe,
-    NgIf,
     AlertComponent,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index b5d74d81f3..15d713bdaf 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -5,73 +5,93 @@
 
   
    
     
-    
-    
-    
-  
    
-
-  
    
-    
-    
-    
    
-      
-    
    
-  
    
-  
-  
-
-  
    
-    
    
-      
-      
-      
-    
    
-  
    
+      [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
+      [routerLink]="[itemPageRoute, 'bitstreams', 'new']">
+     {{"item.edit.bitstreams.upload-button" | translate}}
+  
+  @if (isReinstatable$ | async) {
+    
+}
+
+@if ((isReinstatable$ | async) !== true) {
+  
+}
 
    
 
-
+@if (item && bundles?.length > 0) {
+  
    
+    @for (bundle of bundles; track bundle; let isFirst = $first) {
+      
+      
+    }
+    @if (showLoadMoreLink$ | async) {
+      
    
+        
+      
    
+    }
+  
    
+}
+@if (bundles?.length === 0) {
+  
+}
+@if (!bundles) {
+  
+}
+
+
    
+  
    
+    @if (isReinstatable$ | async) {
+      
+  }
+  
+@if ((isReinstatable$ | async) !== true) {
+  
+}
+
    
+
    
+
    
+
+@if (isProcessingMoveRequest | async) {
+  
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index c10586db47..ea56a4274a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   CommonModule,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -77,9 +75,7 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
     TranslateModule,
     ItemEditBitstreamBundleComponent,
     RouterLink,
-    NgIf,
     VarDirective,
-    NgForOf,
     ThemedLoadingComponent,
     AlertComponent,
     BtnDisabledDirective,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 4450e62ec7..f55821f04f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -1,140 +1,137 @@
 
 
-  
-    
-
-      
-        
-        
-          
-          
-          
-          
-        
-        
-
-        
-        
-          
-          
+                
+              }
+            }
+          
+        
    
-            {{'item.edit.bitstreams.headers.name' | translate}}
-          
-            {{'item.edit.bitstreams.headers.description' | translate}}
-          
-            {{'item.edit.bitstreams.headers.format' | translate}}
-          
-            {{'item.edit.bitstreams.headers.actions' | translate}}
-          
    
-            {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
-          
-
-            
    
-              
-              
    
-                
-
-                
    
+                    
    
+                  
    
+      }
+        
+  }
 
     
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index 0aa7b27d2e..7c56da4c0e 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -18,7 +18,7 @@
                 [cancelButton]="'item.edit.item-mapper.cancel'"
                 [dangerConfirm]="true"
                 (confirm)="removeMappings($event)"
-                (cancel)="onCancel()">
+              (cancel)="onCancel()">
             
    
           
         
@@ -28,29 +28,33 @@
             
    
               
    
                 
+                  [query]="(searchOptions$ | async)?.query"
+                  [currentUrl]="'./'"
+                  [inPlaceSearch]="true"
+                  [searchPlaceholder]="'item.edit.item-mapper.search-form.placeholder' | translate"
+                  (submitSearch)="performedSearch = true">
                 
               
    
             
    
 
-            
    
-              
+                
-            
    
-            
+              
    
+            }
+            @if (!performedSearch) {
+              
+            }
           
         
       
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index 3c93780a87..f1be1a99a6 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -79,7 +76,6 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     ThemedSearchFormComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
     BrowserOnlyPipe,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
index 22b10b28b6..a16fc5cba3 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -1,7 +1,8 @@
 
    
-    
    {{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}
    
+  
    {{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}
    
+  @if (dsoRD$ | async; as dsoRD) {
     
+  }
 
    
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
index d7f1d8135e..6767d507f2 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -29,7 +26,6 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './item-curate.component.html',
   imports: [
     CurationFormComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
   ],
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 5ed36347cb..dc236be398 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -1,99 +1,99 @@
 
    
-    
    
-        
    
+  
    
+    
    
 
-            
    {{headerMessage | translate: {id: item.handle} }}
    
-            
    {{descriptionMessage | translate}}
    
-            
+      
    {{headerMessage | translate: {id: item.handle} }}
    
+      
    {{descriptionMessage | translate}}
    
+      
 
-            
+      
 
-                
    
-
-                    {{'virtual-metadata.delete-item.info' | translate}}
-
-                    
    
-                        
    
-
-                            
    
-                                
+        @if ((typeDTOs$ | async) && (typeDTOs$ | async).length > 0) {
+          
    
+            {{'virtual-metadata.delete-item.info' | translate}}
+            @for (typeDto of (typeDTOs$ | async); track typeDto) {
+              
    
+                
    
+                  
    
+                    
+                  
    
+                  
    
+                    
    
+                      {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
+                    
    
+                    @for (relationshipDto of (typeDto.relationshipDTOs$ | async); track relationshipDto.relationship.id) {
+                      
    
+                        
+                          @if (relatedItem) {
+                            
+                            
+                          }
+                          
    
+                            
    
+                              
                             
    
-
-                            
    
-                                
    
-                                    {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
-                                
    
-                                
    
-                                    
-
-                                        
-                                        
-                                        
    
-                                            
    
-                                                
-                                            
    
-                                        
    
-
-                                        
-                                            
    
-                                                
    
-                                                    {{'virtual-metadata.delete-item.modal-head' | translate}}
-                                                    
-                                                
    
-                                                
    
-                                                    
-                                                    
-                                                    
    
-                                                        
    
-                                                            
    
-                                                                {{metadata.metadataField}}
-                                                            
    
-                                                            
    
-                                                                {{metadata.metadataValue.value}}
-                                                            
    
-                                                        
    
-                                                    
    
-                                                
    
-                                            
    
-                                            
-
-                                        
-                                
    
+                          
    
+                          
+                            
    
+                              
    
+                                {{'virtual-metadata.delete-item.modal-head' | translate}}
+                                
+                              
    
+                              
    
+                                @if (relatedItem) {
+                                  
+                                  
+                                }
+                                @for (metadata of (relationshipDto.virtualMetadata$ | async); track metadata) {
+                                  
    
+                                    
    
+                                      
    
+                                        {{metadata.metadataField}}
+                                      
    
+                                      
    
+                                        {{metadata.metadataValue.value}}
+                                      
    
+                                    
    
+                                  
    
+                                }
+                              
    
                             
    
-
-                        
    
-
-                    
    
-
+                          
+                        
+                      
    
+                    }
+                  
    
                 
    
+              
    
+            }
+          
    
+        }
 
-            
+      
 
-            
    
-              
-              
-            
    
+      
    
+        
+        
+      
    
 
-        
    
     
    
+  
    
 
    
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index c044f62e65..e1bd37f9e5 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,9 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -104,11 +100,9 @@ class RelationshipDTO {
   imports: [
     TranslateModule,
     ListableObjectComponentLoaderComponent,
-    NgIf,
     ModifyItemOverviewComponent,
     AsyncPipe,
     VarDirective,
-    NgForOf,
     RouterLink,
     BtnDisabledDirective,
   ],
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index fa4bacab0e..e2cd2d88af 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -1,58 +1,62 @@
 
    
-    
    
+  
    
+    
    
+      
    {{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}
    
+      
    {{'item.edit.move.description' | translate}}
    
+      
    
         
    
-            
    {{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}
    
-            
    {{'item.edit.move.description' | translate}}
    
-            
    
-                
    
-                  
    
-                    
    {{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}
    
-                    
    
-                      
-                      
-                    
    
-                    
    
-                  
    
-                
    
-            
    
-            
    
-                
    
-                    
    
-                      
-                    
    
-                    
    
-                        {{'item.edit.move.inheritpolicies.description' | translate}}
-                    
    
-                
    
-            
    
-
-          
    
-            
    
-              
-              
-              
+          
    
+            
    {{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}
    
+            
    
+              
+              
             
    
+            
    
           
    
         
    
+      
    
+      
    
+        
    
+          
    
+            
+          
    
+          
    
+            {{'item.edit.move.inheritpolicies.description' | translate}}
+          
    
+        
    
+      
    
+
+      
    
+        
    
+          
+          
+          
+        
    
+      
    
     
    
+  
    
 
    
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 07098aab11..1c6e78850a 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -56,7 +53,6 @@ import {
     RouterLink,
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
index 83c720bcb6..4948bb282c 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
@@ -1,17 +1,21 @@
 
    
-      
-        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
-      
+  
+    {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
+  
 
    
 
    
-  
-    
-  
-  
-    
-  
+  @if (operation.authorized) {
+    
+      
+    
+  }
+  @if (!operation.authorized) {
+    
+      
+    
+  }
 
    
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 7c3793cc57..cb8a754bfb 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -17,7 +17,6 @@ import { ItemOperation } from './itemOperation.model';
     TranslateModule,
     RouterLink,
     NgbTooltipModule,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
index 4cb5db3f1e..2b08842e6d 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -3,13 +3,17 @@
     
    
       
    {{headerMessage | translate: {id: item.handle} }}
    
       
    {{descriptionMessage | translate}}
    
-      
    
-        
    
-          
    {{doiToUpdateMessage | translate}}: {{identifier.value}}
-            ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
-          
    
+      @for (identifier of (identifiers$ | async); track identifier) {
+        
    
+          @if ((identifier.identifierType === 'doi')) {
+            
    
+              
    {{doiToUpdateMessage | translate}}: {{identifier.value}}
+                ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
+              
    
+            
    
+          }
         
    
-      
    
+      }
       
       
    
         
+  {{relationshipMessageKey$ | async | translate}}
+  
 
 
-    
-        
-          
-            
    
-              
+      
+        
    
+          @for (updateValue of updateValues; track trackUpdate($index, updateValue)) {
+            
-              
-            
    
-              
-          
    {{"item.edit.relationships.no-relationships" | translate}}
    
-        
+                
+          }
+        
    
+          
+      @if (updateValues.length === 0) {
+        
    {{"item.edit.relationships.no-relationships" | translate}}
    
+      }
         
-    
+  }
+  @if (loading$ | async) {
+    
+  }
     
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index be74be2fa0..a5d79bb880 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -96,8 +94,6 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     AsyncPipe,
     ObjectValuesPipe,
     VarDirective,
-    NgIf,
-    NgFor,
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index d33323759b..68539d8dc6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -1,35 +1,37 @@
-
    
-  
    
-    
-    
-  
    
-  
    
-    
    
-      
-      
+@if (relatedItem$ | async) {
+  
    
+    
    
+      
+      
+    
    
+    
    
+      
    
+        
+        
+      
    
     
    
   
    
-
    
+}
 
   
+    [relationshipId]="relationship.id"
+    [leftItem]="leftItem$ | async"
+    [rightItem]="rightItem$ | async"
+    [url]="url"
+    (close)="closeVirtualMetadataModal()"
+    (save)="remove()"
+    >
   
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index e711de94c6..f14cb8c24f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -52,7 +49,6 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
   imports: [
     ListableObjectComponentLoaderComponent,
     AsyncPipe,
-    NgIf,
     TranslateModule,
     VirtualMetadataComponent,
     BtnDisabledDirective,
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 6376585ba5..b62256e18e 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,54 +1,64 @@
 
    
-  
+  @if (entityType$ | async; as entityType) {
     
    
       
     
    
-    
    
-      
    
-        
+    @if (relationshipTypes$ | async; as relationshipTypes) {
+      
    
+        @for (relationshipType of relationshipTypes; track trackById($index, relationshipType)) {
+          
    
+            
+          
    
+        }
       
    
-    
    
+    } @else {
+      
+    }
     
    
       
    
         
       
    
     
    
-  
+  } @else {
+    
+      {{ 'item.edit.relationships.no-entity-type' | translate }}
+    
+  }
 
    
 
-
-  
-    {{ 'item.edit.relationships.no-entity-type' | translate }}
-  
-
 
-
-  
-
 
 
   
    
-    
-    
+    @if ((isReinstatable$ | async) !== true) {
+      
+    }
+    @if (isReinstatable$ | async) {
+      
+    }
     
   
    
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 42309116f2..38bc6b8805 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -61,8 +59,6 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     AlertComponent,
     AsyncPipe,
     EditRelationshipListComponent,
-    NgForOf,
-    NgIf,
     NgTemplateOutlet,
     ThemedLoadingComponent,
     TranslateModule,
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index a640bc72cc..ee3004f315 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,23 +1,29 @@
 
    {{'item.edit.tabs.status.description' | translate}}
    
 
    
-  
    
-    
    
-      {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
-    
    
-    
    
-      {{statusData[statusKey]}}
-    
    
-  
    
-
-  
    
-    
    
+  @for (statusKey of statusDataKeys; track statusKey) {
+    
    
       
    
-        {{identifier.identifierType.toLocaleUpperCase()}}
+        {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
+      
    
+      
    
+        {{statusData[statusKey]}}
       
    
-      
    {{identifier.value}}
-        ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
    
     
    
-  
    
+  }
+
+  @for (identifier of (identifiers$ | async); track identifier) {
+    
    
+      @if ((identifier.identifierType==='doi')) {
+        
    
+          
    
+            {{identifier.identifierType.toLocaleUpperCase()}}
+          
    
+          
    {{identifier.value}}
+          ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
    
+        
    
+      }
+    
    
+  }
 
   
    
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
@@ -26,8 +32,10 @@
     {{itemPageRoute$ | async}}
   
    
 
-  
    
-    
-  
    
+  @for (operation of (operations$ | async); track operation) {
+    
    
+      
+    
    
+  }
 
 
    
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 1bb17dc77c..d693d7758b 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -68,9 +66,7 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
   ],
   imports: [
     TranslateModule,
-    NgForOf,
     AsyncPipe,
-    NgIf,
     RouterLink,
     ItemOperationComponent,
     NgClass,
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
index ec0c345d82..2a88d94f55 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
@@ -1,4 +1,6 @@
 
    
-  
+  @if (item) {
+    
+  }
 
    
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index a414af0ce4..f2af333be7 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -23,7 +20,6 @@ import { ItemVersionsComponent } from '../../versions/item-versions.component';
   imports: [
     ItemVersionsComponent,
     VarDirective,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
index dbef279d8c..62a1c48c4d 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
@@ -1,18 +1,20 @@
 
-  
-    
-    
-    
-  
+    
+      
+      
+      
+    
-  
-    
-      
-      
-      
-    
-  
+    @for (mdEntry of metadata | keyvalue; track mdEntry) {
+      @for (mdValue of mdEntry.value; track mdValue) {
+        
+          
+          
+          
+        
+      }
+    }
   
    
   
    {{'item.edit.modify.overview.field'| translate}}{{'item.edit.modify.overview.value'| translate}}{{'item.edit.modify.overview.language'| translate}}
    {{'item.edit.modify.overview.field'| translate}}{{'item.edit.modify.overview.value'| translate}}{{'item.edit.modify.overview.language'| translate}}
    
       
   
    {{mdEntry.key}}{{mdValue.value}}{{mdValue.language}}
    {{mdEntry.key}}{{mdValue.value}}{{mdValue.language}}
    
 
    
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
index 3bd5024837..223c6b58c5 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
@@ -1,7 +1,4 @@
-import {
-  KeyValuePipe,
-  NgFor,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -16,7 +13,7 @@ import { MetadataMap } from '../../../core/shared/metadata.models';
   selector: 'ds-modify-item-overview',
   templateUrl: './modify-item-overview.component.html',
   standalone: true,
-  imports: [NgFor, KeyValuePipe, TranslateModule],
+  imports: [KeyValuePipe, TranslateModule],
 })
 /**
  * Component responsible for rendering a table containing the metadatavalues from the to be edited item
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index f86ab8c288..e1fc018ace 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -1,37 +1,39 @@
 
    
-    
    {{'virtual-metadata.delete-relationship.modal-head' | translate}}
-        
-    
    
-    
    
-        
-            
    
-                
    
-                    
-                
    
-                
    
-                    
-                    
-                    
    
-                        
    
-                            {{metadata.metadataField}}
-                        
    
-                        
    
-                            {{metadata.metadataValue.value}}
-                        
    
-                    
    
-                
    
-            
    
-            
-        
    
-            
+  
    {{'virtual-metadata.delete-relationship.modal-head' | translate}}
+    
+  
    
+  
    
+    @for (itemDTO of itemDTOs$ | async; track trackItemDTO($index, itemDTO)) {
+      
    
+        
    
+          
         
    
+        
    
+          
+          
+          @for (metadata of virtualMetadata.get(itemDTO.item.uuid); track metadata) {
+            
    
+              
    
+                {{metadata.metadataField}}
+              
    
+              
    
+                {{metadata.metadataValue.value}}
+              
    
+            
    
+          }
+        
    
+      
    
+    }
+    
    
+      
     
    
+  
    
 
    
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index e8f42c8fc0..ad413db962 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
 } from '@angular/common';
 import {
   Component,
@@ -45,7 +44,6 @@ interface ItemDTO {
   imports: [
     NgClass,
     TranslateModule,
-    NgForOf,
     VarDirective,
     AsyncPipe,
     ListableObjectComponentLoaderComponent,
diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
index 7c08ce5c1c..f5f42bd272 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -1,21 +1,28 @@
 
-    
    
-        
-            {{ dsoNameService.getName(collection) }}
-        
-    
    
-
-    
    
-        {{'item.page.collections.loading' | translate}}
-    
    
-
-    
-        {{'item.page.collections.load-more' | translate}}
+  
    
+    @for (collection of (this.collections$ | async); track collection; let last = $last) {
+      
+        {{ dsoNameService.getName(collection) }}@if (!last) {
+        
+      }
     
+  }
+
    
+
+@if (isLoading$ | async) {
+  
    
+    {{'item.page.collections.loading' | translate}}
+  
    
+}
+
+@if ((isLoading$ | async) !== true && (hasMore$ | async)) {
+  
+    {{'item.page.collections.load-more' | translate}}
+  
+}
     
diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index e70dcfba2c..d5347c3285 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -51,10 +47,8 @@ import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wr
   imports: [
     MetadataFieldWrapperComponent,
     TranslateModule,
-    NgForOf,
     AsyncPipe,
     RouterLink,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 4cef0a1592..2093318e66 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,9 @@
 
-    
-       {{ linktext || mdValue.value }}
-    
+  @for (mdValue of mdValues; track mdValue; let last = $last) {
+    
+      {{ linktext || mdValue.value }}@if (!last) {
+      
+    }
+  
+}
 
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index 944c70f49a..a583873d6e 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,8 +23,6 @@ import { MetadataValuesComponent } from '../metadata-values/metadata-values.comp
   imports: [
     MetadataFieldWrapperComponent,
     TranslateModule,
-    NgForOf,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 4fc0b41136..015398f041 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -1,13 +1,15 @@
 
-    
-      
+  @for (mdValue of mdValues; track mdValue; let last = $last) {
+    
       
-      
-      
     
+    @if (!last) {
+      
+    }
+  }
 
 
 
@@ -18,12 +20,12 @@
 
 
 
-    
-      {{value}}
-    
+  
+    {{value}}
+  
 
 
 
@@ -45,6 +47,6 @@
 
 
   {{value}}
+    [routerLink]="['/browse', browseDefinition.id]"
+  [queryParams]="getQueryParams(value)">{{value}}
 
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index b42caace7b..d12881ce91 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -36,7 +34,7 @@ import { ImageField } from '../../simple/field-components/specific-field/image-f
   styleUrls: ['./metadata-values.component.scss'],
   templateUrl: './metadata-values.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, NgTemplateOutlet, NgIf, RouterLink, AsyncPipe, TranslateModule, MarkdownDirective],
+  imports: [MetadataFieldWrapperComponent, NgTemplateOutlet, RouterLink, AsyncPipe, TranslateModule, MarkdownDirective],
 })
 export class MetadataValuesComponent implements OnChanges {
 
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
index 8c534e6630..b04d636a13 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,84 +1,84 @@
 
-    
    
-        
    
-            
    {{"item.page.filesection.original.bundle" | translate}}
    
-            
-
-
-                
    
-                    
    
-                        
-                    
    
-                    
    
-                        
    
-                            
    {{"item.page.filesection.name" | translate}}
    
-                            
    {{ dsoNameService.getName(file) }}
    
-
-                            
    {{"item.page.filesection.size" | translate}}
    
-                            
    {{(file.sizeBytes) | dsFileSize }}
    
-
-
-                            
    {{"item.page.filesection.format" | translate}}
    
-                            
    {{(file.format | async)?.payload?.description}}
    
-
-                          
-                            
    {{"item.page.filesection.description" | translate}}
    
-                            
    {{file.firstMetadataValue("dc.description")}}
    
-                              
-                        
    
-                    
    
-                    
    
-                        
-                            {{"item.page.filesection.download" | translate}}
-                        
-                    
    
+  
    
+    @if (hasValuesInBundle(originals)) {
+      
    
+        
    {{"item.page.filesection.original.bundle" | translate}}
    
+        @if (originals?.page?.length > 0) {
+          
+            @for (file of originals?.page; track file) {
+              
    
+                
    
+                  
                 
    
-            
-        
    
-    
    
-    
    
-        
    
-            
    {{"item.page.filesection.license.bundle" | translate}}
    
-            
-
-
-                
    
-                    
    
-                        
-                    
    
-                    
    
-                        
    
-                            
    {{"item.page.filesection.name" | translate}}
    
-                            
    {{ dsoNameService.getName(file) }}
    
-
-                            
    {{"item.page.filesection.size" | translate}}
    
-                            
    {{(file.sizeBytes) | dsFileSize }}
    
-
-                            
    {{"item.page.filesection.format" | translate}}
    
-                            
    {{(file.format | async)?.payload?.description}}
    
-
-
-                            
    {{"item.page.filesection.description" | translate}}
    
-                            
    {{file.firstMetadataValue("dc.description")}}
    
-                        
    
-                    
    
-                    
    
-                        
-                            {{"item.page.filesection.download" | translate}}
-                        
-                    
    
+                
    
+                  
    
+                    
    {{"item.page.filesection.name" | translate}}
    
+                    
    {{ dsoNameService.getName(file) }}
    
+                    
    {{"item.page.filesection.size" | translate}}
    
+                    
    {{(file.sizeBytes) | dsFileSize }}
    
+                    
    {{"item.page.filesection.format" | translate}}
    
+                    
    {{(file.format | async)?.payload?.description}}
    
+                    @if (file.hasMetadata('dc.description')) {
+                      
    {{"item.page.filesection.description" | translate}}
    
+                      
    {{file.firstMetadataValue("dc.description")}}
    
+                    }
+                  
    
                 
    
-            
-        
    
-    
    
+                
    
+                  
+                    {{"item.page.filesection.download" | translate}}
+                  
+                
    
+              
    
+            }
+          
+        }
+      
    
+    }
+  
    
+  
    
+    @if (hasValuesInBundle(licenses)) {
+      
    
+        
    {{"item.page.filesection.license.bundle" | translate}}
    
+        @if (licenses?.page?.length > 0) {
+          
+            @for (file of licenses?.page; track file) {
+              
    
+                
    
+                  
+                
    
+                
    
+                  
    
+                    
    {{"item.page.filesection.name" | translate}}
    
+                    
    {{ dsoNameService.getName(file) }}
    
+                    
    {{"item.page.filesection.size" | translate}}
    
+                    
    {{(file.sizeBytes) | dsFileSize }}
    
+                    
    {{"item.page.filesection.format" | translate}}
    
+                    
    {{(file.format | async)?.payload?.description}}
    
+                    
    {{"item.page.filesection.description" | translate}}
    
+                    
    {{file.firstMetadataValue("dc.description")}}
    
+                  
    
+                
    
+                
    
+                  
+                    {{"item.page.filesection.download" | translate}}
+                  
+                
    
+              
    
+            }
+              
+        }
+      
    
+    }
+  
    
 
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
index f038b18bfc..463ee85635 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -57,12 +53,10 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
   templateUrl: './full-file-section.component.html',
   imports: [
     PaginationComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
     ThemedThumbnailComponent,
-    NgForOf,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
     MetadataFieldWrapperComponent,
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index e9b6436d2f..c6c7d90bf4 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -1,44 +1,60 @@
 
    
-  
    
-    
    
-      
-      
-      
-      
    
-        
    
-          
-          
-        
    
-        
    
-          
-            {{"item.page.link.simple" | translate}}
-          
-        
    
-        
    
-          
-            
-            
-              
-                
-                
-                
-              
-            
-            
-          
    {{mdEntry.key}}{{mdValue.value}}{{mdValue.language}}
    
-        
    
-        
-        
-        
-        
    
-          
    
-            
-          
    
+                  
    
+                
    
+              }
+            
    
+          }
         
    
-      
    
+      }
     
    
-  
    
-  
-  
+  }
+  @if (itemRD?.hasFailed) {
+    
+  }
+  @if (itemRD?.isLoading) {
+    
+  }
 
    
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 88a1254feb..9b982c7a5f 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   KeyValuePipe,
   Location,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -71,8 +69,6 @@ import { ThemedFullFileSectionComponent } from './field-components/file-section/
     ThemedFullFileSectionComponent,
     CollectionsComponent,
     ItemVersionsComponent,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     KeyValuePipe,
     RouterLink,
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
index a64b4ce548..a3d87c780d 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
@@ -8,47 +8,49 @@
   "
   preload="none"
   controls
->
-  
-    
+  >
+  @if (getMediaCap(medias[currentIndex].bitstream.name, captions); as capInfos) {
+    @for (capInfo of capInfos; track capInfo) {
       
-    
-  
+    }
+  }
 
 
-
    
-  
-
-  
-  
    
+@if (medias?.length > 1) {
+  
    
     
-    
    
-      
+    
+    
    
+      
+      
    
+        @for (item of medias; track item; let indexOfelement = $index) {
+          
+        }
+      
    
     
    
   
    
-
    
+}
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 6f962bfa8c..3c4c9b94c6 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -24,10 +21,8 @@ import { languageHelper } from './language-helper';
   templateUrl: './media-viewer-video.component.html',
   styleUrls: ['./media-viewer-video.component.scss'],
   imports: [
-    NgForOf,
     NgbDropdownModule,
     TranslateModule,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html
index a76ee73963..934687c4a0 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.html
+++ b/src/app/item-page/media-viewer/media-viewer.component.html
@@ -1,27 +1,50 @@
 
-  
-  
    
-    
-      
-        
-          
-          
-          
-        
-      
-    
-  
    
-  
-    
-    
+  }
+  @if (!isLoading) {
+    
    
+      @if (mediaList.length > 0) {
+        
+          
+            @if (showVideo) {
+              
+            }
+            @if (showImage) {
+              
+            }
+            @if (showImage || showVideo) {
+            } @else {
+              @if (mediaOptions.image && mediaOptions.video) {
+                
+              }
+              @if (!(mediaOptions.image && mediaOptions.video)) {
+                
-    
-  
+                
+              }
+            }
+          
+        
+      } @else {
+        @if (mediaOptions.image && mediaOptions.video) {
+          
+        }
+        @if (!(mediaOptions.image && mediaOptions.video)) {
+          
+          
+        }
+      }
+    
    
+  }
     
diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
index 7513f5dada..9e5d9bd028 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -49,7 +46,6 @@ import { ThemedMediaViewerVideoComponent } from './media-viewer-video/themed-med
     ThemedMediaViewerImageComponent,
     ThemedThumbnailComponent,
     AsyncPipe,
-    NgIf,
     ThemedMediaViewerVideoComponent,
     TranslateModule,
     ThemedLoadingComponent,
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.html b/src/app/item-page/mirador-viewer/mirador-viewer.component.html
index fe8ede6cee..7f2d0c0aac 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.html
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.html
@@ -1,4 +1,8 @@
 
    {{'iiifviewer.fullscreen.notice' | translate}}
    
-
    {{viewerMessage}}
    
-
+@if (!isViewerAvailable) {
+  
    {{viewerMessage}}
    
+}
+@if (isViewerAvailable) {
+  
+}
 
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
index 5ad17569be..f1cdb6e4f4 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformBrowser,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -43,7 +42,6 @@ import { MiradorViewerService } from './mirador-viewer.service';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index eda90ed213..d2f7bc04b6 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,65 +1,180 @@
 
    
   
    {{'person.orcid.registry.auth' | translate}}
    
-  
+  @if ((isLinkedToOrcid() | async)) {
+    
    
+      
    
+        @if ((hasOrcidAuthorizations() | async)) {
+          
    
+            
    
+              
    {{ 'person.page.orcid.granted-authorizations'| translate }}
    
+              
    
+                
    
+                  
      
+                    @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                      
    • 
+                        {{getAuthorizationDescription(auth) | translate}}
+                      
      • 
+                    }
+                  
    
+                
    
+              
    
+            
    
+          
    
+        }
+        
    
+          
    
+            
    {{ 'person.page.orcid.missing-authorizations'| translate }}
    
+            
    
+              
    
+                @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                  
+                    {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                  
+                }
+                @if ((hasMissingOrcidAuthorizations() | async)) {
+                  
+                    {{'person.page.orcid.missing-authorizations-message' | translate}}
+                    
      
+                      @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                        
    • 
+                          {{getAuthorizationDescription(auth) | translate }}
+                        
      • 
+                      }
+                    
    
+                      
+                }
+              
    
+            
    
+          
    
+        
    
+      
    
+      @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+        
+          {{ 'person.page.orcid.remove-orcid-message' | translate}}
+        
+      }
+      @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+        
    
+          
    
+            
+            @if ((hasMissingOrcidAuthorizations() | async)) {
+              
+            }
+          
    
+        
    
+      }
+    
    
+  } @else {
+    
    
+      
    
+        
    orcid-logo
    
+        
    
+          {{ getOrcidNotLinkedMessage() | async }}
+        
    
+      
    
+      
    
+        
    
+          
+        
    
+      
    
+    
    
+  }
 
    
 
 
   
    
     
    
-      
    
-        
    
-          
    {{ 'person.page.orcid.granted-authorizations'| translate }}
    
-          
    
-            
    
-              
      
-                
    • 
-                  {{getAuthorizationDescription(auth) | translate}}
-                
      • 
-              
    
+      @if ((hasOrcidAuthorizations() | async)) {
+        
    
+          
    
+            
    {{ 'person.page.orcid.granted-authorizations'| translate }}
    
+            
    
+              
    
+                
      
+                  @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                    
    • 
+                      {{getAuthorizationDescription(auth) | translate}}
+                    
      • 
+                  }
+                
    
+              
    
             
    
           
    
         
    
-      
    
+      }
       
    
         
    
           
    {{ 'person.page.orcid.missing-authorizations'| translate }}
    
           
    
             
    
-              
-                {{'person.page.orcid.no-missing-authorizations-message' | translate}}
-              
-              
-                {{'person.page.orcid.missing-authorizations-message' | translate}}
-                
      
-                  
    • 
-                    {{getAuthorizationDescription(auth) | translate }}
-                  
      • 
-                
    
-                  
+              @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                
+                  {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                
+              }
+              @if ((hasMissingOrcidAuthorizations() | async)) {
+                
+                  {{'person.page.orcid.missing-authorizations-message' | translate}}
+                  
      
+                    @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                      
    • 
+                        {{getAuthorizationDescription(auth) | translate }}
+                      
      • 
+                    }
+                  
    
+                    
+              }
             
    
           
    
         
    
       
    
     
    
-    
-      {{ 'person.page.orcid.remove-orcid-message' | translate}}
-    
-    
    
-      
    
-        
-        
+    @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+      
+        {{ 'person.page.orcid.remove-orcid-message' | translate}}
+      
+    }
+    @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+      
    
+        
    
+          
+          @if ((hasMissingOrcidAuthorizations() | async)) {
+            
+          }
+        
    
       
    
-    
    
+    }
   
    
 
 
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 63b908fb83..2d39ee25a8 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -45,8 +41,6 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
     AlertComponent,
     BtnDisabledDirective,
   ],
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 472dc517fa..586f27bb3f 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,19 +1,29 @@
-
-
    
-  {{'person.page.orcid.link.error.message' | translate}}
-
    
-
+@if ((processingConnection | async)) {
+  
+}
+@if ((processingConnection | async) !== true && (connectionStatus | async) !== true) {
+  
    
+    {{'person.page.orcid.link.error.message' | translate}}
+  
    
+}
+@if ((processingConnection | async) !== true && (item | async) && (connectionStatus | async)) {
   
-  
-  
-    
+  @if (isLinkedToOrcid()) {
+    
+  }
+  @if (isLinkedToOrcid()) {
+    
+  }
+}
 
-
    
-  
    
-    
    
-      
-         {{'item.orcid.return' | translate}}
-      
+@if ((processingConnection | async) !== true && (item | async)) {
+  
    
+    
    
+      
    
+        
+           {{'item.orcid.return' | translate}}
+        
+      
    
     
    
   
    
-
    
+}
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index e9d9ec035b..014f995ae0 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -1,53 +1,60 @@
 
    
-  
+  @if ((processing$ | async)) {
+    
+  }
   
    
     
    {{ 'person.orcid.registry.queue' | translate }}
    
 
-    
-      {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
-    
-    
-
-      
    
-        
-          
-          
-            
-            
-            
-          
-          
-          
-          
-            
-            
-            
+                
+              }
+            
+          
    {{'person.page.orcid.sync-queue.table.header.type' | translate}}{{'person.page.orcid.sync-queue.table.header.description' | translate}}{{'person.page.orcid.sync-queue.table.header.action' | translate}}
    
-              
-            
-              {{ entry.description }}
-            
-              
    
-                
+                    
    
+                  
    
+        
    
+          
+    }
   
    
 
    
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
index bfba8eb75d..0d7ece9237 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
@@ -15,9 +15,11 @@
               
    
                 
                 
               
    
             
    
@@ -37,13 +39,15 @@
                 
               
    
               
    
-                
    
-                  
-                  
-                
    
+                @for (option of syncPublicationOptions; track option) {
+                  
    
+                    
+                    
+                  
    
+                }
               
    
             
    
           
    
@@ -60,12 +64,14 @@
                 
               
    
               
    
-                
    
-                  
-                  
-                
    
+                @for (option of syncFundingOptions; track option) {
+                  
    
+                    
+                    
+                  
    
+                }
               
    
             
    
           
    
@@ -82,12 +88,14 @@
                 
               
    
               
    
-                
    
-                  
-                  
-                
    
+                @for (option of syncProfileOptions; track option) {
+                  
    
+                    
+                    
+                  
    
+                }
               
    
             
    
           
    
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 7c3f71785c..5685627345 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -51,7 +51,6 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
     AlertComponent,
     FormsModule,
     TranslateModule,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 3348f55162..fda6d8ae88 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -1,21 +1,35 @@
 
-  
-    
    
-      
-        
-          {{ 'item.page.bitstreams.primary' | translate }}
-          {{ dsoNameService.getName(file) }}
-        
-         ({{(file?.sizeBytes) | dsFileSize }})
-        
-      
-      
-      
    
-        
+  @if (bitstreams?.length > 0) {
+    
+      
    
+        @for (file of bitstreams; track file; let last = $last) {
+          
+            
+              @if (primaryBitsreamId === file.id) {
+                {{ 'item.page.bitstreams.primary' | translate }}
+              }
+              {{ dsoNameService.getName(file) }}
+            
+             ({{(file?.sizeBytes) | dsFileSize }})
+            @if (!last) {
+              
+            }
+          
+        }
+        @if (isLoading) {
+          
+        }
+        @if (!isLastPage) {
+          
    
+            
+          
    
+        }
+        @if (isLastPage && currentPage !== 1) {
+          
    
+            
+          
    
+        }
       
    
-      
    
-        
-      
    
-    
    
-  
+    
+  }
 
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
index e496676847..c4fdd24d13 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
@@ -1,28 +1,32 @@
-
    
-  
-    
    
-
-      
-      
    
-        
-          
+    
+      
    
+        
+        @if (showImage) {
+          
    
+            
+              
-        
+                />
+            
+          
    
+        }
+        
+        
    
+          
+            {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
+            @if (showName || !showImage) {
+              {{ name }}
+            }
+          
+        
    
       
    
-
-      
-      
    
-        
-          {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
-          {{ name }}
-        
-      
    
-    
    
-  
-
    
+        
+  
    
+}
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
index e06d0c25b5..9653b9932c 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
@@ -1,6 +1,5 @@
 import {
   NgClass,
-  NgIf,
   NgStyle,
 } from '@angular/common';
 import {
@@ -16,7 +15,7 @@ import { MetadataFieldWrapperComponent } from 'src/app/shared/metadata-field-wra
   selector: 'ds-item-page-cc-license-field',
   templateUrl: './item-page-cc-license-field.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, NgStyle, TranslateModule, MetadataFieldWrapperComponent],
+  imports: [NgClass, NgStyle, TranslateModule, MetadataFieldWrapperComponent],
 })
 /**
  * Displays the item's Creative Commons license image in it's simple item page
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 85975d4533..34b6682a25 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,6 +1,8 @@
 
    
-  
    
-    {{ type.toLowerCase() + '.page.titleprefix' | translate }}
-  
    
+  @if (item.firstMetadataValue('dspace.entity.type'); as type) {
+    
    
+      {{ type.toLowerCase() + '.page.titleprefix' | translate }}
+    
    
+  }
   {{ dsoNameService.getName(item) }}
 
    
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index 27d7fc585e..3655a864bf 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -12,7 +12,7 @@ import { Item } from '../../../../../core/shared/item.model';
   selector: 'ds-base-item-page-title-field',
   templateUrl: './item-page-title-field.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * This component is used for displaying the title (defined by the {@link DSONameService}) of an item
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index 912115c961..207fcdab5b 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -1,15 +1,25 @@
 
    
-  
    
-    
    
-      
-      
-      
-      
-      
-      
-      
+  @if (itemRD?.hasSucceeded) {
+    
    
+      @if (itemRD?.payload; as item) {
+        
    
+          
+          
+          
+          
+          
+          @if (!item.isWithdrawn || (isAdmin$|async)) {
+            
+          }
+          
+        
    
+      }
     
    
-  
    
-  
-  
+  }
+  @if (itemRD?.hasFailed) {
+    
+  }
+  @if (itemRD?.isLoading) {
+    
+  }
 
    
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index fb2db4ad05..0571f99bea 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformServer,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -79,7 +78,6 @@ import { QaEventNotificationComponent } from './qa-event-notification/qa-event-n
     ThemedLoadingComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
     NotifyRequestsStatusComponent,
     QaEventNotificationComponent,
   ],
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index cfd4c818fc..b70aa7e0b9 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,13 +1,17 @@
-
-
    
-  
    
-    
-    
+@if (showBackButton$ | async) {
+  
+}
+@if (iiifEnabled) {
+  
    
+    
    
+      
+      
+    
    
   
    
-
    
+}
 
    
   
   
@@ -15,14 +19,16 @@
 
    
 
    
   
    
-    
+    @if (!(mediaViewer.image || mediaViewer.video)) {
       
         
       
-    
-    
    
-      
-    
    
+    }
+    @if (mediaViewer.image || mediaViewer.video) {
+      
    
+        
+      
    
+    }
     
     
     
-
    
-  
    
-    
-    
+@if (showBackButton$ | async) {
+  
+}
+@if (iiifEnabled) {
+  
    
+    
    
+      
+      
+    
    
   
    
-
    
+}
 
 
    
   
@@ -16,14 +20,16 @@
 
    
 
    
   
    
-    
+    @if (!(mediaViewer.image || mediaViewer.video)) {
       
         
       
-    
-    
    
-      
-    
    
+    }
+    @if (mediaViewer.image || mediaViewer.video) {
+      
    
+        
+      
    
+    }
     
     
     
-  
+  @for (objectPage of objects; track objectPage; let i = $index) {
     
-      
-      
-      
-      
    
-        
    
-          
+      @for (rep of representations; track rep) {
+        
+        
+      }
+      @if ((i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)) {
+        
+      }
+      @if ((i + 1) === objects.length && representations?.length > 0) {
+        
    
+          @if ((objects.length * incrementBy) < total) {
+            
    
+              
+            
    
+          }
+          @if (objects.length > 1) {
+            
    
+              
+            
    
+          }
         
    
-        
    
-          
-        
    
-      
    
+      }
     
-  
+  }
 
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index d8e5cb0e53..f222fc42f6 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -33,7 +29,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
   selector: 'ds-base-metadata-representation-list',
   templateUrl: './metadata-representation-list.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, VarDirective, MetadataRepresentationLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, VarDirective, MetadataRepresentationLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * This component is used for displaying metadata
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
index c68255f2ed..4dc04e79ad 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
@@ -1,5 +1,5 @@
-
-  
+@if ((requestMap$ | async)?.size > 0) {
+  @for (entry of (requestMap$ | async) | keyvalue ; track entry) {
     
-  
-
+  }
+}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
index 305e3cf8f7..ffaf8ab000 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -39,8 +37,6 @@ import { RequestStatusAlertBoxComponent } from '../request-status-alert-box/requ
     RequestStatusAlertBoxComponent,
     AsyncPipe,
     KeyValuePipe,
-    NgForOf,
-    NgIf,
   ],
 })
 
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
index f5b1f745f4..4171687cd1 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
@@ -1,23 +1,23 @@
-
+@if (data?.length > 0 && displayOptions) {
   
    
     
+      />
     
       
         
    
-          
+          @for (request of data; track request) {
             
    
-              
+          }
         
    
           
         
   
    
-    
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
index e6059688fb..db5efd9b2c 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -23,10 +19,8 @@ import { RequestStatusEnum } from '../notify-status.enum';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     TruncatablePartComponent,
     TruncatableComponent,
-    NgForOf,
     TranslateModule,
     NgClass,
   ],
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
index 16a1532fc0..afdb53b81d 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -1,22 +1,24 @@
-
-  
-    
    
-      
    
-        
-      
    
-      
    
-        
    
-          {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+@if ((sources$ | async); as sources) {
+  @for (source of sources; track source) {
+    @if (source.totalEvents > 0) {
+      
    
+        
    
+          
+          
    
+          
    
+            
    
+              {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+            
    
+            
         
    
-        
       
    
-    
    
-  
-
+    }
+  }
+}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
index a428f7feb4..e681db4a0a 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -36,8 +32,6 @@ import { SplitPipe } from '../../../shared/utils/split.pipe';
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [QualityAssuranceSourceDataService],
   imports: [
-    NgIf,
-    NgForOf,
     AsyncPipe,
     RouterLink,
     TranslateModule,
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 3ce96b2ce3..147650b11a 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,28 +1,32 @@
-
+@if (relationTypes.length > 1) {
   
   
    
-    
-
    
-  
-  
-
    
+}
+@if (relationTypes.length === 1) {
+  
    
+    
+    
+  
    
+}
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
index fc27a9a1e4..b41f00e104 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -25,7 +21,7 @@ import { RelatedEntitiesSearchComponent } from '../related-entities-search/relat
   selector: 'ds-tabbed-related-entities-search',
   templateUrl: './tabbed-related-entities-search.component.html',
   standalone: true,
-  imports: [NgIf, NgbNavModule, NgFor, RelatedEntitiesSearchComponent, VarDirective, AsyncPipe, TranslateModule],
+  imports: [NgbNavModule, RelatedEntitiesSearchComponent, VarDirective, AsyncPipe, TranslateModule],
 })
 /**
  * A component to show related items as search results, split into tabs by relationship-type
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 434093ba2a..e6132661fd 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   isPlatformBrowser,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -38,7 +36,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
   styleUrls: ['./related-items.component.scss'],
   templateUrl: './related-items.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgClass, NgFor, VarDirective, ListableObjectComponentLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, NgClass, VarDirective, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * This component is used for displaying relations between items
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index b49c91aed9..2bfe384bb4 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -1,20 +1,30 @@
 
-  
+  @for (objectPage of objects; track objectPage; let i = $index) {
     
-      
-      
-      
-      
    
-        
    
-          
+      @for (item of itemsRD?.payload?.page; track item) {
+        
+        
+      }
+      @if ((i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)) {
+        
+      }
+      @if ((i + 1) === objects.length && itemsRD?.payload?.page?.length > 0) {
+        
    
+          @if (itemsRD?.payload?.totalPages > objects.length) {
+            
    
+              
+            
    
+          }
+          @if (objects.length > 1) {
+            
    
+              
+            
    
+          }
         
    
-        
    
-          
-        
    
-      
    
+      }
     
-  
+  }
 
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index 95f6ed8d6b..0608ee93cc 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -1,53 +1,60 @@
-    
    
-      
-      
-        {{version.version}}
-      
-      
-        {{version.version}}
-      
-      *
+
    
+  @if ((workspaceId$ | async) || (workflowId$ | async)) {
+    {{version.version}}
+  } @else {
+    {{version.version}}
+  }
+  @if (version?.id === itemVersion?.id) {
+    *
+  }
 
-      
-                      {{ "item.version.history.table.workspaceItem" | translate }}
-                    
+  @if (workspaceId$ | async) {
+    
+      {{ "item.version.history.table.workspaceItem" | translate }}
+    
+  }
 
-      
-                      {{ "item.version.history.table.workflowItem" | translate }}
-                    
+  @if (workflowId$ | async) {
+    
+      {{ "item.version.history.table.workflowItem" | translate }}
+    
+  }
 
-    
    
+
    
 
-    
    
+
    
 
-      
    
-        
+  @if (displayActions) {
+    
    
+      
+      @if (workspaceId$ | async) {
         
-        
-        
-          
-        
-        
-        
-          
-        
-      
    
-
+      }
+      
+      @if (canCreateVersion$ | async) {
+        
+      }
+      
+      @if (canDeleteVersion$ | async) {
+        
+      }
     
    
+  }
+
+
    
 
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index e142f7854c..92597c044f 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -67,7 +66,6 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     RouterLink,
     TranslateModule,
     NgClass,
-    NgIf,
     BtnDisabledDirective,
   ],
   templateUrl: './item-versions-row-element-version.component.html',
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
index 7b622744e2..ae1e862b07 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
@@ -1,40 +1,42 @@
-
    
-  
    {{'item.version.create.modal.header' | translate}}
-    
-  
    
-  
    
-    
    
-      {{ "item.version.create.modal.text" | translate }}
-      
-        {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
-      
-    
    
-    
    
-      
-      
-
+@if ((this.submitted$ | async) !== true) {
+  
    
+    
    {{'item.version.create.modal.header' | translate}}
+      
     
    
-  
    
-  
    
+    
    
+      
    
+        {{ "item.version.create.modal.text" | translate }}
+        @if (!firstVersion) {
+          
+            {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
+          
+        }
+      
    
+      
    
+        
+        
+        
+      
    
+    
    
+    
    
       
       
+      
+    
    
   
    
-
    
-
-
+} @else {
   
    {{'item.version.create.modal.submitted.header' | translate}}
    
   
    
     
    {{'item.version.create.modal.submitted.text' | translate}}
    
@@ -42,4 +44,5 @@
       
     
    
   
    
-
+}
+
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index 8d21501b49..45d0878586 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -21,7 +18,7 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
   templateUrl: './item-versions-summary-modal.component.html',
   styleUrls: ['./item-versions-summary-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDismiss {
 
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index c90b2e545e..8df582fd1a 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,92 +1,114 @@
-
    
-  
    
-    
    
-      
    {{"item.version.history.head" | translate}}
    
-      
-        {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
-      
-      
-        
-          
-          
-            
-            
-            
-            
-          
-          
-          
-          
-            
-            
-            
-            
-          
-          
-        
    {{"item.version.history.table.version" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}
    
-              
-            
-              {{versionDTO.version.submitterName}}
-            
-              {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
-            
-              
    
-                
-                {{versionDTO.version.summary}}
-                
-                  
-                
-              
    
-
-              
    
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                
-              
    
-            
    
-        
    * {{"item.version.history.selected" | translate}}
    
-          
-    
    
+@if ((versionsDTO$ | async); as versionsDTO) {
+  
    
+    @if ((versionRD$ | async)?.payload; as itemVersion) {
+      
    
+        @if (versionsDTO.versionDTOs.length > 0 || displayWhenEmpty) {
+          
    
+            @if (displayTitle) {
+              
    {{"item.version.history.head" | translate}}
    
+            }
+            
+              {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
+            
+            @if (versionsDTO.versionDTOs.length > 0) {
+              
+                
+                  
+                    
+                      
+                      @if ((showSubmitter$ | async)) {
+                        
+                      }
+                      
+                      
+                    
+                  
+                  
+                    @for (versionDTO of versionsDTO.versionDTOs; track versionDTO) {
+                      
+                        
+                        @if ((showSubmitter$ | async)) {
+                          
+                        }
+                        
+                        
+                      
+                    }
+                  
+                
    {{"item.version.history.table.version" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}
    
+                          
+                        
+                            {{versionDTO.version.submitterName}}
+                          
+                          {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
+                        
+                          
    
+                            @if (isThisBeingEdited(versionDTO.version)) {
+                              
+                            } @else {
+                              {{versionDTO.version.summary}}
+                            }
+                            
+                              
+                            
+                          
    
+                          @if (displayActions && versionDTO.canEditVersion | async) {
+                            
    
+                              @if (isThisBeingEdited(versionDTO.version)) {
+                                
+                                
+                                
+                                
+                              } @else {
+                                
+                                
+                              }
+                            
    
+                          }
+                        
    
+                
    * {{"item.version.history.selected" | translate}}
    
+                  
+            }
+          
    
+        }
+      
    
+    }
   
    
-
    
+} @else {
+  @if (displayWhenEmpty) {
+    
+    
+  }
+}
 
-
-  
-  
-
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 90d70b90d3..6ae2af1438 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   DatePipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -82,8 +80,6 @@ interface VersionDTO {
     FormsModule,
     ItemVersionsRowElementVersionComponent,
     NgClass,
-    NgFor,
-    NgIf,
     PaginationComponent,
     TranslateModule,
     BtnDisabledDirective,
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.html b/src/app/item-page/versions/notice/item-versions-notice.component.html
index 90502c5df7..1ceaf16d41 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.html
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.html
@@ -1,5 +1,7 @@
-
-
+@if ((showLatestVersionNotice$ | async) === true) {
+  
+  
+}
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
index c136d3f06f..adbc41b511 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -41,7 +38,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
   selector: 'ds-item-versions-notice',
   templateUrl: './item-versions-notice.component.html',
   standalone: true,
-  imports: [NgIf, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [AlertComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for displaying a warning notice when the item is not the latest version within its version history
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index ddb74f58f9..39565e6cdd 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,26 +1,30 @@
-  
    
+@if ((moreThanOne$ | async) !== true) {
+  
    
     
   
    
+}
+@if ((moreThanOne$ | async)) {
   
    
+    ngbDropdown
+    >
     
     
   
    
+}
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
index e9787e8645..2d39ef241d 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
@@ -191,7 +191,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index cf242670b3..7a89089051 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -45,7 +42,6 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 1f20330c17..0e167475bf 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,24 +1,28 @@
-  
    
+@if ((moreThanOne$ | async) !== true) {
+  
    
     
   
    
+}
+@if ((moreThanOne$ | async)) {
   
    
+    ngbDropdown
+    >
     
     
   
    
+}
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
index 9e50556fe3..3da919a009 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
@@ -196,7 +196,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index f06df3082e..25cfe437bd 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -47,7 +44,6 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    NgIf,
     BtnDisabledDirective,
   ],
   standalone: true,
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
index d0052b9355..6cdc1c0722 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
@@ -1,10 +1,12 @@
 
    
   
    
-    
+    @if (uploadFilesOptions.url !== '') {
+      
+    }
 
   
    
   
    
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index cf7cb7ab72..7d014b9393 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -38,7 +38,6 @@ import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submissi
     MyDSpaceNewExternalDropdownComponent,
     MyDSpaceNewSubmissionDropdownComponent,
     UploaderComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index 9e5cadc12b..564946edcd 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -4,9 +4,11 @@
   
 
    
 
-
+@if (configuration && context) {
+  
+}
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index 0607b27fef..7acb900739 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -49,7 +46,6 @@ export const MYDSPACE_ROUTE = '/mydspace';
     MyDSpaceNewSubmissionComponent,
     AsyncPipe,
     RoleDirective,
-    NgIf,
     SuggestionsNotificationComponent,
     MyDspaceQaEventsNotificationsComponent,
   ],
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
index c29412e004..f2deb49c9f 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -1,29 +1,30 @@
-
-  
-    
    
-    
    
-      
-    
    
-      
    
-        
    
-          {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
-        
    
-        
+        
    
+          
+        
    
+        
    
+          
    
+            {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
+          
    
+          
+        
    
       
    
-    
    
-      
-    
+    }
+  }
+}
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
index 9da65fb2e6..8bc141e258 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -32,10 +28,8 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     AsyncPipe,
-    NgForOf,
     TranslateModule,
     RouterLink,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 0af5c706b7..116e3a4a4e 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,37 +1,41 @@
 
    
+  [id]="'expandable-navbar-section-' + section.id"
+  (mouseenter)="onMouseEnter($event)"
+  (mouseleave)="onMouseLeave($event)"
+  data-test="navbar-section-wrapper">
   
-      
-        
-      
+    role="menuitem"
+    (keyup.enter)="toggleSection($event)"
+    (keyup.space)="toggleSection($event)"
+    (click)="toggleSection($event)"
+    (keydown)="keyDown($event)"
+    aria-haspopup="menu"
+    data-test="navbar-section-toggler"
+    [attr.aria-expanded]="(active$ | async).valueOf()"
+    [attr.aria-controls]="expandableNavbarSectionId()"
+    class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+    [class.disabled]="section.model?.disabled">
+    
+      
+    
     
   
-  
   
    
   
    
@@ -21,208 +25,271 @@
         {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
       
 
-      
+      @if ((isEventPageLoading | async)) {
+        
+      }
 
-      
-
-        
-          
-          
    
-            
-              
-              
-                
-                
-                
-                
-                  
-                  
-                
-                
-              
-              
-              
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                    
-                    
-                  
-
-                  
+                      
+                    }
+                  
+                
    {{'quality-assurance.event.table.trust' | translate}}{{'quality-assurance.event.table.publication' | translate}}
-                  {{'quality-assurance.event.table.project-details' | translate}}
-                
-                    {{'quality-assurance.event.table.reasons' | translate}}
-                  
-                    {{'quality-assurance.event.table.person-who-requested' | translate}}
-                  {{'quality-assurance.event.table.actions' | translate}}
    {{eventElement?.event?.trust}}
-                  {{eventElement.title}}
-                    {{eventElement.title}}
-                    
    
-                      {{'quality-assurance.event.table.event.message.serviceUrl' | translate}}
-                      
-                        {{eventElement.event.message.serviceId}}
-                      
-                    
    
-                    
    
-                      {{'quality-assurance.event.table.event.message.link' | translate}}
-                      
-                        {{eventElement.event.message.href}}
-                      
-                    
    
-                      		
-                    
    {{'quality-assurance.event.table.pidtype' | translate}} {{eventElement.event.message.type}}
    
-                    
    {{'quality-assurance.event.table.pidvalue' | translate}}
    
-                      
-                        {{eventElement.event.message.value}}
-                      
-                      {{eventElement.event.message.value}}
-                    
    
-                      		
-                    
    {{'quality-assurance.event.table.subjectValue' | translate}}
-                       
    {{eventElement.event.message.value}}
    
-                      		
-                    
    
-                      {{'quality-assurance.event.table.abstract' | translate}}
    
-                      {{eventElement.event.message.abstract}}
-                    
    
-                    
-                      		
-                      
    
-                        
-                          {{eventElement.event.message.reason}}
    
-                            
-                      
    
-                        		
-                      
    
-                        
-                          
-                        
-                      
    
-                        		
-                    
    
-                      {{'quality-assurance.event.table.suggestedProject' | translate}}
-                    
    
-                    
    
-                      {{'quality-assurance.event.table.project' | translate}}
    
-                      {{eventElement.event.message.title}}
-                    
    
-                    
    
-                      {{'quality-assurance.event.table.acronym' | translate}} {{eventElement.event.message.acronym}}
    
-                      {{'quality-assurance.event.table.code' | translate}} {{eventElement.event.message.code}}
    
-                      {{'quality-assurance.event.table.funder' | translate}} {{eventElement.event.message.funder}}
    
-                      {{'quality-assurance.event.table.fundingProgram' | translate}} {{eventElement.event.message.fundingProgram}}
    
-                      {{'quality-assurance.event.table.jurisdiction' | translate}} {{eventElement.event.message.jurisdiction}}
-                    
    
-                    
    
-                    
    
-                      {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
-                      {{eventElement.handle}} 
-                      
    
-                        
+                            
    
+                          }
+                        
    
+              
    
+            }
+              
+            
+      }
     
    
   
    
 
    
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
index 0d96e7e065..bcefd317c8 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -351,7 +351,7 @@ describe('QualityAssuranceEventsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 23fc73345d..6adaf9dea9 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -87,7 +83,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 4b9bbe64f3..36ac863cf4 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -1,7 +1,7 @@
 
    
   
   
 
    
@@ -14,16 +14,18 @@
       
     
    
   
    
-  
    
-    {{ (labelPrefix + label + '.bountToLocal' |translate) }}
-    
    
-      
    
-        
-          {{externalSourceEntry.projectTitle}}
-        
+  @if (externalSourceEntry.projectTitle) {
+    
    
+      {{ (labelPrefix + label + '.bountToLocal' |translate) }}
+      
    
+        
    
+          
+            {{externalSourceEntry.projectTitle}}
+          
+        
    
       
    
     
    
-  
    
+  }
 
   
    {{ (labelPrefix + label + '.select' | translate) }}
    
 
@@ -37,27 +39,33 @@
       
    
     
    
 
-    
-    
-    
+    @if ((isLoading$ | async)) {
+      
+    }
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true) {
+      
+      
+    }
 
-    
    
-      
-        
    {{(labelPrefix + label + '.notFound' | translate)}}
    
-          
-    
    
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true) {
+      
    
+        
+          
    {{(labelPrefix + label + '.notFound' | translate)}}
    
+            
+      
    
+    }
 
   
    
 
    
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
index fb331fafa4..bc0fb62326 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -231,7 +231,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   eventData = eventData;
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4954a32747..63e9848020 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -106,7 +103,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [RouterLink, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index 3a1ccbe7dc..6155b7901f 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -1,58 +1,69 @@
 
    
-    
    
-      
    
-        
    {{'quality-assurance.title'| translate}}
    
-        
-      
    
-    
    
-    
    
-      
    
-        
    {{'quality-assurance.source'| translate}}
    
-
-        
-        
-
-          
-          
-            
-            
    
-              
-                
-                
-                  
-                  
-                  
-                
-                
-                
-                  
-                    
-                    
-                    
-                  
-                
-              
    {{'quality-assurance.table.source' | translate}}{{'quality-assurance.table.last-event' | translate}}{{'quality-assurance.table.actions' | translate}}
    {{sourceElement.id}}{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}
-                      
    
-                        
-                      
    
-                    
    
-            
    
-              
-            
-      
    
+  
    
+    
    
+      
    {{'quality-assurance.title'| translate}}
    
+      
     
    
   
    
+  
    
+    
    
+      
    {{'quality-assurance.source'| translate}}
    
+
+      @if ((isSourceLoading() | async)) {
+        
+      }
+      @if ((isSourceLoading() | async) !== true) {
+        
+          @if ((isSourceProcessing() | async)) {
+            
+          }
+          @if ((isSourceProcessing() | async) !== true) {
+            @if ((sources$ | async)?.length === 0) {
+              
+            }
+            @if ((sources$ | async)?.length !== 0) {
+              
    
+                
+                  
+                    
+                      
+                      
+                      
+                    
+                  
+                  
+                    @for (sourceElement of (sources$ | async); track sourceElement; let i = $index) {
+                      
+                        
+                        
+                        
+                      
+                    }
+                  
+                
    {{'quality-assurance.table.source' | translate}}{{'quality-assurance.table.last-event' | translate}}{{'quality-assurance.table.actions' | translate}}
    {{sourceElement.id}}{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}
+                          
    
+                            
+                          
    
+                        
    
+              
    
+            }
+          }
+            
+      }
+    
    
+  
    
+
    
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
index 36309fd937..e9c0133725 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -167,7 +167,7 @@ describe('QualityAssuranceSourceComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index 44a748d1a0..575394fd2f 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   AfterViewInit,
@@ -40,7 +38,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   templateUrl: './quality-assurance-source.component.html',
   styleUrls: ['./quality-assurance-source.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
 export class QualityAssuranceSourceComponent implements OnDestroy, OnInit, AfterViewInit {
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index 4afc5e2185..84c91d2150 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -2,60 +2,75 @@
   
    
     
    
       
    {{'quality-assurance.title'| translate}}
    
-      {{'quality-assurance.topics.description'| translate:{source: sourceId} }}
-      
-        {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
-        {{(getTargetItemTitle() | async)}}
-      
+      @if (!targetId) {
+        {{'quality-assurance.topics.description'| translate:{source: sourceId} }}
+      }
+      @if (targetId) {
+        
+          {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
+          {{(getTargetItemTitle() | async)}}
+        
+      }
     
    
   
    
   
    
     
    
       
    {{'quality-assurance.topics'| translate}}
    
 
-      
-      
-
-        
-        
-          
-          
    
-            
-              
-              
-                
-                
-                
-              
-              
-              
-                
-                  
-                  
-                  
+                      
+                    }
+                  
+                
    {{'quality-assurance.table.topic' | translate}}{{'quality-assurance.table.last-event' | translate}}{{'quality-assurance.table.actions' | translate}}
    {{topicElement.name}}{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}
-                    
    
-                      
+                          
    
+                        
    
+              
    
+            }
+          }
+            
+      }
     
    
   
    
 
    
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
index c764128e46..38792eb632 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -175,7 +175,7 @@ describe('QualityAssuranceTopicsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
index 176dba95ac..f700b68689 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   AfterViewInit,
@@ -54,7 +52,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   templateUrl: './quality-assurance-topics.component.html',
   styleUrls: ['./quality-assurance-topics.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
 export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, AfterViewInit {
   /**
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index d262e746b1..96a0eb82e5 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -1,29 +1,35 @@
 
    
   
    
-    
-    
+    @if (isCollectionFixed) {
+      
+    } @else {
       
-
       
-    
+    }
 
   
    
   
-  
+@if (!isBulk) {
+  
+}
 
    
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 0362e50f4c..dc0e075667 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -30,7 +30,6 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
   imports: [
     EntityDropdownComponent,
     TranslateModule,
-    NgIf,
     NgbDropdownModule,
     BtnDisabledDirective,
   ],
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
index e23c244eb4..a343f5dc7e 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
@@ -1,20 +1,24 @@
 
    
-  
    
-    
-      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-      
-    
    {{'suggestion.evidence.score' | translate}}{{'suggestion.evidence.type' | translate}}{{'suggestion.evidence.notes' | translate}}
    {{evidences[evidence].score}}{{evidence | translate}}{{evidences[evidence].notes}}
    
-  
    
+  @if (evidences) {
+    
    
+      
+        
+          
+            
+            
+            
+          
+        
+        
+          @for (evidence of evidences | dsObjectKeys; track evidence) {
+            
+              
+              
+              
+            
+          }
+        
+      
    {{'suggestion.evidence.score' | translate}}{{'suggestion.evidence.type' | translate}}{{'suggestion.evidence.notes' | translate}}
    {{evidences[evidence].score}}{{evidence | translate}}{{evidences[evidence].notes}}
    
+    
    
+  }
 
    
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
index e07a1dce75..d968826b70 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,8 +19,6 @@ import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
   animations: [fadeIn],
   imports: [
     TranslateModule,
-    NgIf,
-    NgFor,
     ObjectKeysPipe,
   ],
   standalone: true,
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
index ef27876f2c..63fda69813 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
@@ -4,8 +4,8 @@
     
    
       
    
         
+          [checked]="isSelected" (change)="changeSelected($event)"
+          [attr.aria-label]="object.display"/>
       
    
     
    
     
@@ -17,29 +17,31 @@
     
    
     
     
    
-        
-        
-        
+      
+      
+      
       
     
    
   
    
   
-  
    
-    
    
-      
+  @if (seeEvidence) {
+    
    
+      
    
+        
+      
    
     
    
-  
    
+  }
 
    
 
    
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
index 99a22f89ea..9e55ba0825 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -26,7 +26,6 @@ import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-
   templateUrl: './suggestion-list-element.component.html',
   animations: [fadeIn],
   imports: [
-    NgIf,
     TranslateModule,
     ItemSearchResultListElementComponent,
     SuggestionActionsComponent,
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
index 2b2a668916..25c1268dc5 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
@@ -3,49 +3,60 @@
     
    
       
    {{'suggestion.title'| translate}}
    
 
-      
-      
-
-        
-        
-          
-          
    
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
+                      
+                    }
+                  
+                
    {{'suggestion.table.name' | translate}}{{'suggestion.table.actions' | translate}}
    
-                    {{targetElement.display}}
-                  
-                    
    
-                      
+                          
    
+                        
    
+              
    
+            }
+          }
+            
+      }
     
    
   
    
 
    
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 8654890138..ccb56629c6 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   AfterViewInit,
   Component,
@@ -46,8 +42,6 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
     AsyncPipe,
     TranslateModule,
     PaginationComponent,
-    NgIf,
-    NgFor,
     RouterLink,
   ],
   standalone: true,
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.html b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
index 838bdb95ad..476cbe5109 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.html
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
@@ -1,9 +1,13 @@
-
-  
-    
    
-      
    
-      {{ 'notification.suggestion.please' | translate }}
-       {{ 'notification.suggestion.review' | translate}} 
-    
    
-      
-    
+@if ((suggestionsRD$ | async); as suggestions) {
+  @for (suggestion of suggestions; track suggestion) {
+    
+      @if (suggestion.total > 0) {
+        
    
+          
    
+          {{ 'notification.suggestion.please' | translate }}
+           {{ 'notification.suggestion.review' | translate}} 
+        
    
+      }
+        
+  }
+}
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
index 568cafb9de..208c1bfcbd 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,8 +22,6 @@ import { SuggestionsService } from '../suggestions.service';
     RouterLink,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
   ],
   styleUrls: ['./suggestions-notification.component.scss'],
 })
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
index f21b469ccf..b04d3deaef 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.html
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
@@ -1,27 +1,32 @@
-
    
-