diff --git a/src/main/angular/src/app/app.component.html b/src/main/angular/src/app/app.component.html
index db697e7..a4d25f0 100644
--- a/src/main/angular/src/app/app.component.html
+++ b/src/main/angular/src/app/app.component.html
@@ -44,7 +44,7 @@
 
   <div class="option">
     <button class="back" (click)="shiftAlignment(+1)">&larr;</button>
-    {{ alignment.display }}
+    {{ alignment.display }} {{ offset > 0 ? -offset : '' }}
     <button class="next" (click)="shiftAlignment(-1)">&rarr;</button>
   </div>
 
diff --git a/src/main/angular/src/app/series/Alignment.ts b/src/main/angular/src/app/series/Alignment.ts
index 36b9974..dcb7b2b 100644
--- a/src/main/angular/src/app/series/Alignment.ts
+++ b/src/main/angular/src/app/series/Alignment.ts
@@ -38,12 +38,26 @@ export class Alignment {
     } else if (offset === 1) {
       return "Letzte 5 Minuten";
     }
-    const date = new Date();
-    date.setHours(date.getHours() - offset);
-    if (offset < 7) {
-      return `${formatDate(date, "EEEE", locale)}`;
+
+    const today = new Date();
+    today.setMinutes(today.getMinutes() - today.getMinutes() % 5);
+
+    const yesterday = new Date(today);
+    yesterday.setDate(yesterday.getDate() - 1);
+
+    const yesterday2 = new Date(today);
+    yesterday2.setDate(yesterday2.getDate() - 1);
+
+    const date = new Date(today);
+    date.setMinutes(date.getMinutes() - offset * 5);
+    if (date.getDay() === today.getDay()) {
+      return `${formatDate(date, "HH:mm", locale)}`;
+    } else if (date.getDay() === yesterday.getDay()) {
+      return `Gestern ${formatDate(date, "HH:mm", locale)}`;
+    } else if (date.getDay() === yesterday2.getDay()) {
+      return `Gestern ${formatDate(date, "HH:mm", locale)}`;
     }
-    return `${formatDate(date, "EE", locale)} ${formatDate(date, "dd.MM.yyyy", locale)}`;
+    return `${formatDate(date, "EE", locale)} ${formatDate(date, "dd.MM.yyyy", locale)} ${formatDate(date, "HH:mm", locale)}`;
   }
 
   static offsetTitleHour(offset: number, locale: string): string {