diff --git a/src/main/webapp/app/admin/audits/audits.component.html b/src/main/webapp/app/admin/audits/audits.component.html
index 212c9696439e..1f0a1b7a29b2 100644
--- a/src/main/webapp/app/admin/audits/audits.component.html
+++ b/src/main/webapp/app/admin/audits/audits.component.html
@@ -15,32 +15,24 @@ <h4 jhiTranslate="audits.filter.title">Filter by date</h4>
             </div>
         </div>
     </div>
-    @if (audits?.length === 0) {
-        <div class="alert alert-warning">
-            <span jhiTranslate="audits.notFound">No audit found</span>
-        </div>
-    }
-    @if (audits && audits.length > 0) {
+    @if (audits?.length) {
         <div class="table-responsive">
             <table class="table table-sm table-striped" aria-describedby="audits-page-heading">
                 <thead>
-                    @switch (canLoad()) {
-                        @case (true) {
-                            <tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="transition()">
-                                <th scope="col" jhiSortBy="auditEventDate"><span jhiTranslate="audits.table.header.date">Date</span> <fa-icon [icon]="faSort" /></th>
-                                <th scope="col" jhiSortBy="principal"><span jhiTranslate="audits.table.header.principal">User</span> <fa-icon [icon]="faSort" /></th>
-                                <th scope="col" jhiSortBy="auditEventType"><span jhiTranslate="audits.table.header.status">State</span> <fa-icon [icon]="faSort" /></th>
-                                <th scope="col"><span jhiTranslate="audits.table.header.data">Extra data</span></th>
-                            </tr>
-                        }
-                        @case (false) {
-                            <tr>
-                                <th scope="col"><span jhiTranslate="audits.table.header.date">Date</span></th>
-                                <th scope="col"><span jhiTranslate="audits.table.header.principal">User</span></th>
-                                <th scope="col"><span jhiTranslate="audits.table.header.status">State</span></th>
-                                <th scope="col"><span jhiTranslate="audits.table.header.data">Extra data</span></th>
-                            </tr>
-                        }
+                    @if (canLoad) {
+                        <tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="transition()">
+                            <th scope="col" jhiSortBy="auditEventDate"><span jhiTranslate="audits.table.header.date">Date</span> <fa-icon [icon]="faSort" /></th>
+                            <th scope="col" jhiSortBy="principal"><span jhiTranslate="audits.table.header.principal">User</span> <fa-icon [icon]="faSort" /></th>
+                            <th scope="col" jhiSortBy="auditEventType"><span jhiTranslate="audits.table.header.status">State</span> <fa-icon [icon]="faSort" /></th>
+                            <th scope="col"><span jhiTranslate="audits.table.header.data">Extra data</span></th>
+                        </tr>
+                    } @else {
+                        <tr>
+                            <th scope="col"><span jhiTranslate="audits.table.header.date">Date</span></th>
+                            <th scope="col"><span jhiTranslate="audits.table.header.principal">User</span></th>
+                            <th scope="col"><span jhiTranslate="audits.table.header.status">State</span></th>
+                            <th scope="col"><span jhiTranslate="audits.table.header.data">Extra data</span></th>
+                        </tr>
                     }
                 </thead>
                 <tbody>
@@ -64,8 +56,6 @@ <h4 jhiTranslate="audits.filter.title">Filter by date</h4>
                 </tbody>
             </table>
         </div>
-    }
-    @if (audits && audits.length > 0) {
         <div>
             <div class="row justify-content-center">
                 <jhi-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }" />
@@ -79,9 +69,13 @@ <h4 jhiTranslate="audits.filter.title">Filter by date</h4>
                     [rotate]="true"
                     [boundaryLinks]="true"
                     (pageChange)="transition()"
-                    [disabled]="!canLoad()"
+                    [disabled]="!canLoad"
                 />
             </div>
         </div>
+    } @else {
+        <div class="alert alert-warning">
+            <span jhiTranslate="audits.notFound">No audit found</span>
+        </div>
     }
 </div>
diff --git a/src/main/webapp/app/admin/audits/audits.component.ts b/src/main/webapp/app/admin/audits/audits.component.ts
index 9b14209276c3..7f98a7fbe09f 100644
--- a/src/main/webapp/app/admin/audits/audits.component.ts
+++ b/src/main/webapp/app/admin/audits/audits.component.ts
@@ -19,6 +19,7 @@ export class AuditsComponent implements OnInit {
     predicate!: string;
     ascending!: boolean;
     toDate = '';
+    canLoad: boolean;
 
     // page information
     page = 1;
@@ -40,15 +41,16 @@ export class AuditsComponent implements OnInit {
     ngOnInit(): void {
         this.toDate = this.today();
         this.fromDate = this.previousMonth();
+        this.canLoad = this.calculateCanLoad();
         this.handleNavigation();
     }
 
-    canLoad(): boolean {
+    calculateCanLoad(): boolean {
         return this.fromDate !== '' && this.toDate !== '';
     }
 
     transition(): void {
-        if (this.canLoad()) {
+        if (this.canLoad) {
             this.router.navigate(['/admin/audits'], {
                 queryParams: {
                     page: this.page,
@@ -90,6 +92,7 @@ export class AuditsComponent implements OnInit {
             if (params.get('to')) {
                 this.toDate = this.datePipe.transform(params.get('to'), this.dateFormat)!;
             }
+            this.canLoad = this.calculateCanLoad();
             this.loadData();
         });
     }
diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html
index 3ad3b97a514a..04e72eb48c36 100644
--- a/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html
+++ b/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html
@@ -44,8 +44,6 @@ <h3 id="garbageCollectorMetrics" jhiTranslate="metrics.jvm.gc.title">Garbage col
                 <div class="col-md-9">Classes loaded</div>
                 <div class="col-md-3 text-right">{{ garbageCollectorMetrics.classesLoaded }}</div>
             </div>
-        }
-        @if (garbageCollectorMetrics) {
             <div class="row">
                 <div class="col-md-9">Classes unloaded</div>
                 <div class="col-md-3 text-right">{{ garbageCollectorMetrics.classesUnloaded }}</div>
diff --git a/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html b/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html
index 1ea6c69749b1..e303ba08c62c 100644
--- a/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html
+++ b/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html
@@ -22,64 +22,60 @@ <h2>
                         <th></th>
                     </tr>
                 </thead>
-                @if (notifications) {
-                    <tbody>
-                        @for (notification of notifications; track trackIdentity($index, notification)) {
-                            <tr>
-                                <td>{{ notification.id }}</td>
-                                <td>{{ notification.title }}</td>
-                                <td>{{ notification.text }}</td>
-                                <td>{{ notification.type }}</td>
-                                <td>
-                                    @switch (getNotificationState(notification)) {
-                                        @case (ACTIVE) {
-                                            <span class="badge bg-success">
-                                                {{ 'artemisApp.systemNotification.active' | artemisTranslate }}
-                                            </span>
-                                        }
-                                        @case (EXPIRED) {
-                                            <span class="badge bg-danger">
-                                                {{ 'artemisApp.systemNotification.expired' | artemisTranslate }}
-                                            </span>
-                                        }
-                                        @case (SCHEDULED) {
-                                            <span class="badge bg-info">
-                                                {{ 'artemisApp.systemNotification.scheduled' | artemisTranslate }}
-                                            </span>
-                                        }
+                <tbody>
+                    @for (notification of notifications; track trackIdentity($index, notification)) {
+                        <tr>
+                            <td>{{ notification.id }}</td>
+                            <td>{{ notification.title }}</td>
+                            <td>{{ notification.text }}</td>
+                            <td>{{ notification.type }}</td>
+                            <td>
+                                @switch (getNotificationState(notification)) {
+                                    @case (ACTIVE) {
+                                        <span class="badge bg-success">
+                                            {{ 'artemisApp.systemNotification.active' | artemisTranslate }}
+                                        </span>
                                     }
-                                </td>
-                                <td>{{ notification.notificationDate | artemisDate }}</td>
-                                <td>{{ notification.expireDate | artemisDate }}</td>
-                                <td class="text-end">
-                                    <div class="btn-group flex-btn-group-container">
-                                        <a id="viewButton" [routerLink]="['./', notification.id]" class="btn btn-info btn-sm">
-                                            <fa-icon [icon]="faEye" />
-                                            <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
-                                        </a>
-                                        <a id="editButton" [routerLink]="['./', notification.id, 'edit']" queryParamsHandling="merge" class="btn btn-warning btn-sm">
-                                            <fa-icon [icon]="faWrench" />
-                                            <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
-                                        </a>
-                                        <button
-                                            jhiDeleteButton
-                                            [entityTitle]="!!notification.title ? notification.title : ''"
-                                            deleteQuestion="artemisApp.systemNotification.delete.question"
-                                            (delete)="deleteNotification(notification.id!)"
-                                            [dialogError]="dialogError$"
-                                        >
-                                            <fa-icon [icon]="faTimes" />
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                }
+                                    @case (EXPIRED) {
+                                        <span class="badge bg-danger">
+                                            {{ 'artemisApp.systemNotification.expired' | artemisTranslate }}
+                                        </span>
+                                    }
+                                    @case (SCHEDULED) {
+                                        <span class="badge bg-info">
+                                            {{ 'artemisApp.systemNotification.scheduled' | artemisTranslate }}
+                                        </span>
+                                    }
+                                }
+                            </td>
+                            <td>{{ notification.notificationDate | artemisDate }}</td>
+                            <td>{{ notification.expireDate | artemisDate }}</td>
+                            <td class="text-end">
+                                <div class="btn-group flex-btn-group-container">
+                                    <a id="viewButton" [routerLink]="['./', notification.id]" class="btn btn-info btn-sm">
+                                        <fa-icon [icon]="faEye" />
+                                        <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
+                                    </a>
+                                    <a id="editButton" [routerLink]="['./', notification.id, 'edit']" queryParamsHandling="merge" class="btn btn-warning btn-sm">
+                                        <fa-icon [icon]="faWrench" />
+                                        <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
+                                    </a>
+                                    <button
+                                        jhiDeleteButton
+                                        [entityTitle]="!!notification.title ? notification.title : ''"
+                                        deleteQuestion="artemisApp.systemNotification.delete.question"
+                                        (delete)="deleteNotification(notification.id!)"
+                                        [dialogError]="dialogError$"
+                                    >
+                                        <fa-icon [icon]="faTimes" />
+                                    </button>
+                                </div>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
             </table>
         </div>
-    }
-    @if (notifications) {
         <div>
             <div class="row justify-content-center">
                 <jhi-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }" />
diff --git a/src/main/webapp/app/admin/user-management/user-management.component.html b/src/main/webapp/app/admin/user-management/user-management.component.html
index 9feea30f568a..0042c879405d 100644
--- a/src/main/webapp/app/admin/user-management/user-management.component.html
+++ b/src/main/webapp/app/admin/user-management/user-management.component.html
@@ -148,11 +148,6 @@ <h2>
                                     <ngb-highlight [result]="user.name" [term]="searchTerm" />
                                 </td>
                                 <td>
-                                    @if (!user.activated) {
-                                        <button class="btn btn-danger btn-sm" (click)="setActive(user, true)" jhiTranslate="artemisApp.userManagement.deactivated">
-                                            Deactivated
-                                        </button>
-                                    }
                                     @if (user.activated) {
                                         <button
                                             class="btn btn-success btn-sm"
@@ -162,6 +157,10 @@ <h2>
                                         >
                                             Activated
                                         </button>
+                                    } @else {
+                                        <button class="btn btn-danger btn-sm" (click)="setActive(user, true)" jhiTranslate="artemisApp.userManagement.deactivated">
+                                            Deactivated
+                                        </button>
                                     }
                                 </td>
                                 <td>{{ user.langKey }}</td>
diff --git a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.html b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.html
index ae12e8e0b294..66c06b909e40 100644
--- a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.html
+++ b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.html
@@ -1,11 +1,10 @@
 <h3 class="top-container flex-wrap flex-lg-nowrap">
     <!--back button only used in assessment dashboard-->
     <div class="row-container me-2">
-        @if (!isTestRun) {
-            <span jhiTranslate="artemisApp.assessment.assessment">Assessment</span>
-        }
         @if (isTestRun) {
             <span jhiTranslate="artemisApp.assessment.testRunAssessment">Test Run Assessment</span>
+        } @else {
+            <span jhiTranslate="artemisApp.assessment.assessment">Assessment</span>
         }
         @if (isIllegalSubmission) {
             <span class="badge bg-danger ms-3" style="font-size: 65%" jhiTranslate="artemisApp.assessment.assessmentIllegalSubmission">
diff --git a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html
index 1107afc29dee..7422a04e3a75 100644
--- a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html
+++ b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html
@@ -96,14 +96,10 @@ <h2>
                             <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.studentLogin' | artemisTranslate }}</a>
                             <fa-icon [icon]="faSort" />
                         </th>
-                    }
-                    @if (course?.isAtLeastInstructor) {
                         <th jhiSortBy="student.name">
                             <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.studentName' | artemisTranslate }}</a>
                             <fa-icon [icon]="faSort" />
                         </th>
-                    }
-                    @if (course?.isAtLeastInstructor) {
                         <th jhiSortBy="complaintResponse.reviewer.name">
                             <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.reviewerName' | artemisTranslate }}</a>
                             <fa-icon [icon]="faSort" />
@@ -147,13 +143,9 @@ <h2>
                             <td>
                                 <span>{{ complaint.student?.login }}</span>
                             </td>
-                        }
-                        @if (course?.isAtLeastInstructor) {
                             <td>
                                 <span>{{ complaint.student?.name }}</span>
                             </td>
-                        }
-                        @if (course?.isAtLeastInstructor) {
                             <td>
                                 <span>{{ complaint.complaintResponse?.reviewer?.name }}</span>
                             </td>
diff --git a/src/main/webapp/app/course/competencies/create-competency/create-competency.component.html b/src/main/webapp/app/course/competencies/create-competency/create-competency.component.html
index abd82d1afbc2..05d394a72f70 100644
--- a/src/main/webapp/app/course/competencies/create-competency/create-competency.component.html
+++ b/src/main/webapp/app/course/competencies/create-competency/create-competency.component.html
@@ -4,8 +4,7 @@
             <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
         </div>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div class="container">
         <div class="d-flex align-items-center">
             <h3>{{ 'artemisApp.competency.createCompetency.title' | artemisTranslate }}</h3>
diff --git a/src/main/webapp/app/course/competencies/edit-competency/edit-competency.component.html b/src/main/webapp/app/course/competencies/edit-competency/edit-competency.component.html
index b14ba7c28893..2f63ced1e572 100644
--- a/src/main/webapp/app/course/competencies/edit-competency/edit-competency.component.html
+++ b/src/main/webapp/app/course/competencies/edit-competency/edit-competency.component.html
@@ -4,8 +4,7 @@
             <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
         </div>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div class="container">
         <h3>{{ 'artemisApp.competency.editCompetency.title' | artemisTranslate }}</h3>
         <jhi-competency-form
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
index e66a73ca93ef..aa56233500bd 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
@@ -1,10 +1,9 @@
 <div class="row mt-3 g-3">
     <div class="col-12 col-md-6 col-lg-7 mt-0">
-        @if (!isExamMode) {
-            <span style="font-size: 16px" jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.courseInformation"></span>
-        }
         @if (isExamMode) {
             <span style="font-size: 16px" jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.examInformation"></span>
+        } @else {
+            <span style="font-size: 16px" jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.courseInformation"></span>
         }
         <!-- chart -->
         @if (numberOfSubmissions.total !== 0) {
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
index 0155d10ec73f..396b2735560b 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
@@ -4,8 +4,7 @@
             <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
         </div>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div>
         @for (node of path; track node; let last = $last) {
             <div>
diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html
index 209f57a7707a..0800421b2302 100644
--- a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html
+++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html
@@ -170,8 +170,6 @@ <h5><span jhiTranslate="artemisApp.studentExams.summary">Student Summary</span><
                     <a class="btn btn-primary summery ms-4" [routerLink]="'./summary'">
                         <span jhiTranslate="artemisApp.exam.summary">Summary</span>
                     </a>
-                }
-                @if (course?.isAtLeastInstructor) {
                     <div ngbTooltip="{{ 'artemisApp.examTimeline.disabledTooltip' | artemisTranslate }}" [disableTooltip]="studentExam?.submitted!">
                         <button class="btn btn-primary mb-auto ms-5" [routerLink]="'./exam-timeline'" [disabled]="!studentExam.submitted">
                             <span jhiTranslate="artemisApp.examTimeline.breadcrumb">Timeline</span>
diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html
index 436315849ab0..ff9d4abedb2b 100644
--- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html
+++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html
@@ -12,8 +12,6 @@ <h2>
                     }
                     <span jhiTranslate="artemisApp.studentExams.generateStudentExams">Generate student exams</span>
                 </button>
-            }
-            @if (course?.isAtLeastInstructor) {
                 <button
                     id="generateMissingStudentExamsButton"
                     class="btn btn-primary mt-1"
@@ -25,8 +23,6 @@ <h2>
                     }
                     <span jhiTranslate="artemisApp.studentExams.generateMissingStudentExams">Generate missing individual exams</span>
                 </button>
-            }
-            @if (course?.isAtLeastInstructor) {
                 <button id="startExercisesButton" class="btn btn-primary mt-1" (click)="startExercises()" [disabled]="isLoading || isExamStarted || exercisePreparationRunning">
                     @if (isLoading) {
                         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
@@ -43,8 +39,6 @@ <h2>
                 <fa-icon [icon]="faExclamationTriangle" class="text-warning" />
                 <span jhiTranslate="artemisApp.studentExams.unlockAllRepositories">Unlock all repositories</span>
             </button>
-        }
-        @if (!localVCEnabled && course?.isAtLeastInstructor) {
             <button id="lockAllRepositoriesButton" class="btn btn-danger mt-1" (click)="handleLockAllRepositories()" [disabled]="isLoading">
                 @if (isLoading) {
                     <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
diff --git a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html
index 5ee225ea5b3a..5d9da12a8027 100644
--- a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html
+++ b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html
@@ -5,8 +5,7 @@
                 <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
             </div>
         </div>
-    }
-    @if (!isLoading) {
+    } @else {
         <div class="d-flex border-bottom pb-2 mt-3">
             @if (!hasExamStarted) {
                 <div>
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.html b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.html
index 185ccfe9f572..daa764b342a3 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.html
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.html
@@ -2,8 +2,7 @@
     <div class="text-center">
         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div [class]="codeHints?.length ? '' : 'text-center'">
         @if (codeHints?.length) {
             <button
@@ -15,71 +14,67 @@
             >
                 Recreate code hints
             </button>
-        }
-        @if (codeHints?.length === 0) {
             <button
                 type="button"
                 class="btn btn-warning"
-                jhiTranslate="artemisApp.codeHint.management.step4.createHintsButton.label"
-                [ngbTooltip]="'artemisApp.codeHint.management.step4.createHintsButton.tooltip' | artemisTranslate"
-                (click)="generateCodeHints(true, 'createHintsButton')"
+                jhiTranslate="artemisApp.codeHint.management.step4.recreateHintsButton.label"
+                [ngbTooltip]="'artemisApp.codeHint.management.step4.recreateHintsButton.tooltip' | artemisTranslate"
+                (click)="generateCodeHints(true, 'recreateHintsButton')"
             >
-                Create code hints
+                Update code hints
             </button>
-        }
-        @if (codeHints?.length) {
+        } @else {
             <button
                 type="button"
                 class="btn btn-warning"
-                jhiTranslate="artemisApp.codeHint.management.step4.recreateHintsButton.label"
-                [ngbTooltip]="'artemisApp.codeHint.management.step4.recreateHintsButton.tooltip' | artemisTranslate"
-                (click)="generateCodeHints(true, 'recreateHintsButton')"
+                jhiTranslate="artemisApp.codeHint.management.step4.createHintsButton.label"
+                [ngbTooltip]="'artemisApp.codeHint.management.step4.createHintsButton.tooltip' | artemisTranslate"
+                (click)="generateCodeHints(true, 'createHintsButton')"
             >
-                Update code hints
+                Create code hints
             </button>
         }
     </div>
-}
-@if (!isLoading && codeHints?.length) {
-    <mat-accordion>
-        <mat-expansion-panel [expanded]="false" [disabled]="true" class="code-hint-creation-expansion-panel-wrapper-header">
-            <mat-expansion-panel-header>
-                <mat-panel-title>{{ 'artemisApp.codeHint.management.step4.title' | artemisTranslate }}</mat-panel-title>
-                <mat-panel-description>{{ 'artemisApp.codeHint.management.step4.task' | artemisTranslate }}</mat-panel-description>
-            </mat-expansion-panel-header>
-        </mat-expansion-panel>
-        @for (codeHint of codeHints; track codeHint) {
-            <mat-expansion-panel class="code-hint-creation-expansion-panel-wrapper">
+    @if (codeHints?.length) {
+        <mat-accordion>
+            <mat-expansion-panel [expanded]="false" [disabled]="true" class="code-hint-creation-expansion-panel-wrapper-header">
                 <mat-expansion-panel-header>
-                    <mat-panel-title
-                        ><td>{{ codeHint.title }}</td></mat-panel-title
-                    >
-                    <mat-panel-description>
-                        {{ codeHint?.programmingExerciseTask?.taskName }}
-                    </mat-panel-description>
+                    <mat-panel-title>{{ 'artemisApp.codeHint.management.step4.title' | artemisTranslate }}</mat-panel-title>
+                    <mat-panel-description>{{ 'artemisApp.codeHint.management.step4.task' | artemisTranslate }}</mat-panel-description>
                 </mat-expansion-panel-header>
-                <div>
-                    @if (codeHint?.solutionEntries) {
-                        <div>
-                            <jhi-code-hint-container [codeHint]="codeHint" />
+            </mat-expansion-panel>
+            @for (codeHint of codeHints; track codeHint) {
+                <mat-expansion-panel class="code-hint-creation-expansion-panel-wrapper">
+                    <mat-expansion-panel-header>
+                        <mat-panel-title>
+                            <td>{{ codeHint.title }}</td>
+                        </mat-panel-title>
+                        <mat-panel-description>
+                            {{ codeHint?.programmingExerciseTask?.taskName }}
+                        </mat-panel-description>
+                    </mat-expansion-panel-header>
+                    <div>
+                        @if (codeHint?.solutionEntries) {
+                            <div>
+                                <jhi-code-hint-container [codeHint]="codeHint" />
+                            </div>
+                        }
+                        <div class="btn-group">
+                            <a
+                                [routerLink]="['/course-management', exercise?.course?.id, 'programming-exercises', exercise?.id, 'exercise-hints', codeHint.id, 'edit']"
+                                class="btn btn-warning btn-sm me-1"
+                            >
+                                <fa-icon [icon]="faWrench" />
+                                <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
+                            </a>
                         </div>
-                    }
-                    <div class="btn-group">
-                        <a
-                            [routerLink]="['/course-management', exercise?.course?.id, 'programming-exercises', exercise?.id, 'exercise-hints', codeHint.id, 'edit']"
-                            class="btn btn-warning btn-sm me-1"
-                        >
-                            <fa-icon [icon]="faWrench" />
-                            <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
-                        </a>
                     </div>
-                </div>
-            </mat-expansion-panel>
-        }
-    </mat-accordion>
-}
-@if (!codeHints?.length) {
-    <div class="text-center mt-2">
-        <span jhiTranslate="artemisApp.codeHint.management.step4.notGenerated">No code hints have been generated yet.</span>
-    </div>
+                </mat-expansion-panel>
+            }
+        </mat-accordion>
+    } @else {
+        <div class="text-center mt-2">
+            <span jhiTranslate="artemisApp.codeHint.management.step4.notGenerated">No code hints have been generated yet.</span>
+        </div>
+    }
 }
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/treeview/components/treeview/treeview.component.html b/src/main/webapp/app/exercises/programming/shared/code-editor/treeview/components/treeview/treeview.component.html
index 6cd30a579e99..fde88ded4d76 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/treeview/components/treeview/treeview.component.html
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/treeview/components/treeview/treeview.component.html
@@ -2,17 +2,14 @@
     <div class="form-inline row-item">
         @if (item.children) {
             <i (click)="onCollapseExpand()" aria-hidden="true">
-                @switch (item.collapsed) {
-                    @case (true) {
-                        <svg width="0.8rem" height="0.8rem" viewBox="0 0 16 16" class="bi bi-caret-right-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M12.14 8.753l-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z" />
-                        </svg>
-                    }
-                    @case (false) {
-                        <svg width="0.8rem" height="0.8rem" viewBox="0 0 16 16" class="bi bi-caret-down-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M7.247 11.14L2.451 5.658C1.885 5.013 2.345 4 3.204 4h9.592a1 1 0 0 1 .753 1.659l-4.796 5.48a1 1 0 0 1-1.506 0z" />
-                        </svg>
-                    }
+                @if (item.collapsed) {
+                    <svg width="0.8rem" height="0.8rem" viewBox="0 0 16 16" class="bi bi-caret-right-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M12.14 8.753l-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z" />
+                    </svg>
+                } @else {
+                    <svg width="0.8rem" height="0.8rem" viewBox="0 0 16 16" class="bi bi-caret-down-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M7.247 11.14L2.451 5.658C1.885 5.013 2.345 4 3.204 4h9.592a1 1 0 0 1 .753 1.659l-4.796 5.48a1 1 0 0 1-1.506 0z" />
+                    </svg>
                 }
             </i>
         }
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html
index c757e3e69f6c..8f5f0b1cce9f 100644
--- a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html
@@ -29,8 +29,7 @@
                 <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
             </div>
         </div>
-    }
-    @if (!isLoading) {
+    } @else {
         <div>
             @if (exerciseHint?.content) {
                 <div class="p-3 mb-2 border border-1 border-secondary bg-light" [innerHTML]="exerciseHint!.content | htmlForMarkdown"></div>
diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html
index f1f33077ac81..1c5283f887ee 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html
@@ -191,8 +191,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                                     <span class="datatable-header-cell-label bold sortable">{{ 'artemisApp.exercise.teamShortName' | artemisTranslate }}</span>
                                     <fa-icon [icon]="controls.iconForSortPropField('team.shortName')" />
                                 </span>
-                            }
-                            @if (!exercise.teamMode) {
+                            } @else {
                                 <span class="datatable-header-cell-wrapper" (click)="controls.onSort('student.login')">
                                     <span class="datatable-header-cell-label bold sortable">{{ 'artemisApp.exercise.studentId' | artemisTranslate }}</span>
                                     <fa-icon [icon]="controls.iconForSortPropField('student.login')" />
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
index 73b88b578e4e..8b89959e72b8 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
@@ -4,8 +4,7 @@
             <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
         </div>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div class="container">
         <div class="row">
             <div class="col-12 mx-auto">
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html
index 8b235c61b077..ee71cdb80fc3 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html
@@ -4,8 +4,7 @@
             <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
         </div>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div class="container">
         <ng-content />
     </div>
diff --git a/src/main/webapp/app/overview/course-discussion/course-discussion.component.html b/src/main/webapp/app/overview/course-discussion/course-discussion.component.html
index 3f5be086d810..61d5f257e9d6 100644
--- a/src/main/webapp/app/overview/course-discussion/course-discussion.component.html
+++ b/src/main/webapp/app/overview/course-discussion/course-discussion.component.html
@@ -141,9 +141,7 @@
                 <div class="col-12 post-result-information">
                     {{ 'artemisApp.metis.loadingPosts' | artemisTranslate }}
                 </div>
-            }
-            <!-- information on loaded posts -->
-            @if (!isLoading) {
+            } @else {
                 <div class="ms-2 col-12 post-result-information">
                     {{ totalItems === 0 ? ('artemisApp.metis.noPosts' | artemisTranslate) : ('artemisApp.metis.postNumberInformation' | artemisTranslate: { number: totalItems }) }}
                 </div>
diff --git a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html
index bec20f950335..13f99e5814c8 100644
--- a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html
+++ b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html
@@ -10,8 +10,7 @@ <h4 class="modal-title" jhiTranslate="artemisApp.competency.prerequisite.title">
                     <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
                 </div>
             </div>
-        }
-        @if (!isLoading) {
+        } @else {
             <div class="row justify-content-center gx-5 gy-2">
                 @for (prerequisite of prerequisites; track identify(i, prerequisite); let i = $index) {
                     <jhi-competency-card class="col-12 col-lg-6" [competency]="prerequisite" [isPrerequisite]="true" />
diff --git a/src/main/webapp/app/shared/consistency-check/consistency-check.component.html b/src/main/webapp/app/shared/consistency-check/consistency-check.component.html
index 8af70980c4c7..77fb3bb334ea 100644
--- a/src/main/webapp/app/shared/consistency-check/consistency-check.component.html
+++ b/src/main/webapp/app/shared/consistency-check/consistency-check.component.html
@@ -14,26 +14,24 @@ <h4 class="modal-title" jhiTranslate="artemisApp.consistencyCheck.title">Consist
                         <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
                     </div>
                 </div>
-            }
-            @if (!isLoading) {
+            } @else {
                 <div class="mt-3 text-center">
-                    @if (inconsistencies.length === 0) {
+                    @if (inconsistencies?.length) {
                         <div>
-                            <span class="h1 text-success"><fa-icon [icon]="faCheck" /></span>
+                            <span class="h1 text-danger"><fa-icon [icon]="faTimes" /></span>
                             <br />
-                            <span jhiTranslate="artemisApp.consistencyCheck.noInconsistencies">No inconsistencies found</span>
+                            <span jhiTranslate="artemisApp.consistencyCheck.inconsistenciesFound">Following inconsistencies have been found</span>
                         </div>
-                    }
-                    @if (inconsistencies.length > 0) {
+                    } @else {
                         <div>
-                            <span class="h1 text-danger"><fa-icon [icon]="faTimes" /></span>
+                            <span class="h1 text-success"><fa-icon [icon]="faCheck" /></span>
                             <br />
-                            <span jhiTranslate="artemisApp.consistencyCheck.inconsistenciesFound">Following inconsistencies have been found</span>
+                            <span jhiTranslate="artemisApp.consistencyCheck.noInconsistencies">No inconsistencies found</span>
                         </div>
                     }
                 </div>
             }
-            @if (!isLoading && inconsistencies.length > 0) {
+            @if (!isLoading && inconsistencies?.length) {
                 <div class="table-responsive p-1 my-5">
                     <table class="table table-striped">
                         <thead>
diff --git a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html
index 743ad871a696..689664eec13d 100644
--- a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html
+++ b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html
@@ -4,8 +4,7 @@
             <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
         </div>
     </div>
-}
-@if (!isLoading) {
+} @else {
     <div class="container-fluid">
         <ng-content />
     </div>