diff --git a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.css b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.css
deleted file mode 100644
index ceb788099..000000000
--- a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: Copyright DB InfraGO AG and contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-.pipeline-card:hover {
-  background-color: var(--hover-color);
-  cursor: pointer;
-}
-
-.configuration {
-  margin: 10px;
-}
-
-.footer-wrapper {
-  align-items: flex-end;
-}
-
-.pipelines {
-  max-height: 80vh;
-}
diff --git a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.html b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.html
index 38e518171..d93250364 100644
--- a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.html
+++ b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.html
@@ -5,67 +5,89 @@
 
 <div class="dialog">
   <div>
-    <div *ngIf="!selectedPipeline" class="flex justify-between gap-5">
-      <span
-        >Please select the pipeline you'd like to execute or to see the logs:
-      </span>
-      <a mat-icon-button (click)="createPipeline()"
-        ><mat-icon>add_circle</mat-icon></a
-      >
-    </div>
-    <div class="pipelines">
-      <div *ngFor="let pipeline of this.pipelineService.pipelines$ | async">
-        <div
-          matRipple
-          *ngIf="!selectedPipeline || selectedPipeline.id === pipeline.id"
-          (click)="selectPipeline(pipeline)"
-          class="pipeline-card collab-card"
+    @if (!selectedPipeline) {
+      <div class="flex justify-between gap-5">
+        <span
+          >Please select the pipeline you'd like to execute or to see the logs:
+        </span>
+        <a mat-icon-button (click)="createPipeline()"
+          ><mat-icon>add_circle</mat-icon></a
         >
-          <span class="text-center"><b>Backup</b> (ID: {{ pipeline.id }})</span>
-          <br />
-          <span *ngIf="pipeline.run_nightly"
-            >Runs nightly at 3am
-            <span *ngIf="pipeline.include_commit_history"
-              >with commit history</span
-            ><span *ngIf="!pipeline.include_commit_history"
-              >without commit history</span
+      </div>
+    }
+    @if ((this.pipelineService.pipelines$ | async) === undefined) {
+      <ngx-skeleton-loader
+        appearance="circle"
+        [theme]="{
+          'border-radius': '5px',
+          height: '250px',
+          width: '600px',
+          'max-width': '100%',
+          border: '1px solid white',
+          margin: '0'
+        }"
+      ></ngx-skeleton-loader>
+    } @else {
+      <div class="flex max-h-[80vh] flex-col gap-2">
+        @for (
+          pipeline of this.pipelineService.pipelines$ | async;
+          track pipeline.id
+        ) {
+          @if (!selectedPipeline || selectedPipeline.id === pipeline.id) {
+            <button
+              matRipple
+              (click)="selectPipeline(pipeline)"
+              class="collab-card text-left hover:cursor-pointer hover:bg-hover"
             >
-            or with manual trigger
-          </span>
-          <span *ngIf="!pipeline.run_nightly"
-            >Runs only with manual trigger</span
-          >
-          <hr />
-          <div class="flex flex-wrap justify-between gap-y-1">
-            <span style="flex-basis: 45%"
-              ><b>TeamForCapella</b> <br />
-              Instance <i>{{ pipeline.t4c_model.instance_name }}</i
-              >, <br />Repository <i>{{ pipeline.t4c_model.repository_name }}</i
-              >, <br />Project:
-              <i>{{ pipeline.t4c_model.project_name }}</i> </span
-            ><span style="flex-basis: 10%"
-              ><mat-icon class="mat-icon-position top">arrow_forward</mat-icon>
-            </span>
-            <span style="flex-basis: 45%">
-              <b>Git</b> <br />
-              URL: <i>{{ pipeline.git_model.path }}</i
-              >, <br />revision: <i>{{ pipeline.git_model.revision }}</i
-              >, <br />entrypoint:
-              <i>{{ pipeline.git_model.entrypoint }}</i>
-            </span>
+              <span><b>Backup</b> (ID: {{ pipeline.id }})</span>
+              <br />
+              <span>
+                @if (pipeline.run_nightly) {
+                  Runs nightly at 3am
+                  @if (pipeline.include_commit_history) {
+                    with
+                  } @else {
+                    without
+                  }
+                  commit history or on manual trigger.
+                } @else {
+                  Runs on manual trigger.
+                }
+              </span>
+              <hr />
+              <div class="flex flex-wrap items-center justify-between gap-y-1">
+                <span style="flex-basis: 45%"
+                  ><b>TeamForCapella</b> <br />
+                  Instance <i>{{ pipeline.t4c_model.instance_name }}</i
+                  >, <br />Repository
+                  <i>{{ pipeline.t4c_model.repository_name }}</i
+                  >, <br />Project:
+                  <i>{{ pipeline.t4c_model.project_name }}</i> </span
+                ><span style="flex-basis: 10%"
+                  ><mat-icon class="mat-icon-position top"
+                    >arrow_forward</mat-icon
+                  >
+                </span>
+                <span style="flex-basis: 45%">
+                  <b>Git</b> <br />
+                  URL: <i>{{ pipeline.git_model.path }}</i
+                  >, <br />revision: <i>{{ pipeline.git_model.revision }}</i
+                  >, <br />entrypoint:
+                  <i>{{ pipeline.git_model.entrypoint }}</i>
+                </span>
+              </div>
+            </button>
+          }
+        } @empty {
+          <div class="my-2">
+            No pipelines found. Please create a new pipeline.
           </div>
-        </div>
+        }
       </div>
-    </div>
-    <div
-      class="my-2"
-      *ngIf="(this.pipelineService.pipelines$ | async)?.length === 0"
-    >
-      No pipelines found. Please create a new pipeline.
-    </div>
+    }
 
-    <div>
-      <form *ngIf="selectedPipeline" [formGroup]="configurationForm">
+    @if (selectedPipeline) {
+      <form [formGroup]="configurationForm">
         <hr />
         <h3>Run the pipeline</h3>
 
@@ -86,9 +108,6 @@ <h3>Run the pipeline</h3>
           </button>
         </div>
       </form>
-    </div>
-
-    <div *ngIf="selectedPipeline">
       <hr />
       <h3>Additional actions</h3>
       <div class="flex flex-row flex-wrap items-center gap-2">
@@ -106,15 +125,16 @@ <h3>Additional actions</h3>
         >
           View runs
         </a>
-        <mat-slide-toggle
-          *ngIf="userService.validateUserRole('administrator')"
-          [(ngModel)]="force"
-          aria-label="Force deletion of pipeline"
-          matTooltip="Delete pipeline even if T4C instance not reachable"
-        >
-          Force deletion
-        </mat-slide-toggle>
+        @if (userService.validateUserRole("administrator")) {
+          <mat-slide-toggle
+            [(ngModel)]="force"
+            aria-label="Force deletion of pipeline"
+            matTooltip="Delete pipeline even if T4C instance not reachable"
+          >
+            Force deletion
+          </mat-slide-toggle>
+        }
       </div>
-    </div>
+    }
   </div>
 </div>
diff --git a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts
index 2281264c9..6401a02b9 100644
--- a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts
+++ b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { NgIf, NgFor, AsyncPipe } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component, Inject, OnInit } from '@angular/core';
 import {
   FormControl,
@@ -23,6 +23,7 @@ import { MatIcon } from '@angular/material/icon';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
 import { MatTooltip } from '@angular/material/tooltip';
 import { Router } from '@angular/router';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { ToastService } from 'src/app/helpers/toast/toast.service';
 import {
   PipelineRun,
@@ -40,13 +41,10 @@ import {
 @Component({
   selector: 'app-trigger-pipeline',
   templateUrl: './trigger-pipeline.component.html',
-  styleUrls: ['./trigger-pipeline.component.css'],
   standalone: true,
   imports: [
-    NgIf,
     MatIconAnchor,
     MatIcon,
-    NgFor,
     MatRipple,
     FormsModule,
     ReactiveFormsModule,
@@ -56,6 +54,7 @@ import {
     MatSlideToggle,
     MatTooltip,
     AsyncPipe,
+    NgxSkeletonLoaderModule,
   ],
 })
 export class TriggerPipelineComponent implements OnInit {
diff --git a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.stories.ts b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.stories.ts
index 791b0c785..ecf2da816 100644
--- a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.stories.ts
+++ b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.stories.ts
@@ -88,7 +88,16 @@ export const PipelineOverview: Story = {
       providers: [
         {
           provide: PipelineService,
-          useFactory: () => new MockPipelineService([pipeline, pipeline]),
+          useFactory: () =>
+            new MockPipelineService([
+              pipeline,
+              {
+                ...pipeline,
+                id: 2,
+                run_nightly: true,
+                include_commit_history: true,
+              },
+            ]),
         },
       ],
     }),
diff --git a/frontend/src/app/projects/models/diagrams/model-diagram-dialog/model-diagram-dialog.component.html b/frontend/src/app/projects/models/diagrams/model-diagram-dialog/model-diagram-dialog.component.html
index 83ac5b361..48422e5cb 100644
--- a/frontend/src/app/projects/models/diagrams/model-diagram-dialog/model-diagram-dialog.component.html
+++ b/frontend/src/app/projects/models/diagrams/model-diagram-dialog/model-diagram-dialog.component.html
@@ -70,12 +70,13 @@ <h2 class="mb-5 text-xl font-medium">View diagrams</h2>
                 }"
               ></ngx-skeleton-loader>
             } @else if (diagrams[diagram.uuid].content) {
-              <img
-                (click)="openModelDiagramPreviewDialog(diagram)"
-                matTooltip="Open preview"
-                class="mb-2 h-[200px] w-full !touch-auto hover:cursor-pointer"
-                [src]="diagrams[diagram.uuid].content"
-              />
+              <button (click)="openModelDiagramPreviewDialog(diagram)">
+                <img
+                  matTooltip="Open preview"
+                  class="mb-2 h-[200px] w-full !touch-auto hover:cursor-pointer"
+                  [src]="diagrams[diagram.uuid].content"
+                />
+              </button>
             }
           } @else {
             <div class="diagram-error">
diff --git a/frontend/src/app/sessions/user-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.component.html b/frontend/src/app/sessions/user-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.component.html
index c9ee9886f..09a1263e9 100644
--- a/frontend/src/app/sessions/user-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.component.html
+++ b/frontend/src/app/sessions/user-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.component.html
@@ -16,8 +16,8 @@ <h1>File browser</h1>
       >
       </mat-progress-bar>
     </div>
-    <button mat-button>
-      <mat-icon (click)="reset()" *ngIf="uploadProgress">Cancel </mat-icon>
+    <button class="flex items-center" mat-button (click)="reset()">
+      <mat-icon *ngIf="uploadProgress">cancel </mat-icon>
     </button>
   </div>