diff --git a/src/components/TrainsView/StopLabel.vue b/src/components/TrainsView/StopLabel.vue
index 443c3ff..7debd3d 100644
--- a/src/components/TrainsView/StopLabel.vue
+++ b/src/components/TrainsView/StopLabel.vue
@@ -3,13 +3,17 @@
     <span class="name" v-html="stop.nameHtml"></span>
 
     <span
-      class="date arrival"
       v-if="stop.position != 'begin'"
-      :class="{
-        delayed: stop.arrivalDelay > 0 && stop.status != 'unconfirmed',
-        preponed: stop.arrivalDelay < 0 && stop.status != 'unconfirmed',
-        'on-time': stop.arrivalDelay == 0 && stop.status == 'confirmed'
-      }"
+      class="date arrival"
+      :data-status="
+        stop.arrivalDelay > 0 && stop.status != 'unconfirmed'
+          ? 'delayed'
+          : stop.arrivalDelay < 0 && stop.status != 'unconfirmed'
+          ? 'preponed'
+          : stop.arrivalDelay == 0 && stop.status == 'confirmed'
+          ? 'on-time'
+          : ''
+      "
     >
       <span v-if="stop.arrivalDelay != 0 && stop.status != 'unconfirmed'">
         <s>{{ timestampToString(stop.arrivalScheduled) }}</s>
@@ -23,20 +27,36 @@
     </span>
 
     <span
+      v-if="
+        stop.duration ||
+        (stop.status == 'stopped' && stop.position != 'begin') ||
+        stop.departureDelay != stop.arrivalDelay
+      "
       class="date stop"
-      v-if="stop.duration || stop.status == 'stopped'"
-      :class="stop.type.replace(', ', '-')"
+      :data-stop-types="stop.type.replace(', ', '-')"
+      :data-stop-status="
+        stop.departureDelay - stop.arrivalDelay > 0 && !stop.duration ? 'delayed' : ''
+      "
     >
-      {{ stop.duration }} {{ stop.type == '' ? 'pt' : stop.type }}
+      {{ stop.duration || stop.departureDelay - stop.arrivalDelay }}
+      {{ stop.type == '' ? 'pt' : stop.type }}
     </span>
 
     <span
+      v-if="
+        stop.position != 'end' &&
+        (stop.duration != 0 || stop.status == 'stopped' || stop.departureDelay != stop.arrivalDelay)
+      "
       class="date departure"
-      v-if="stop.position != 'end' && (stop.duration != 0 || stop.status == 'stopped')"
-      :class="{
-        delayed: stop.departureDelay > 0 && stop.status == 'confirmed',
-        preponed: stop.departureDelay < 0 && stop.status == 'confirmed'
-      }"
+      :data-status="
+        stop.departureDelay > 0 && stop.status == 'confirmed'
+          ? 'delayed'
+          : stop.departureDelay < 0 && stop.status == 'confirmed'
+          ? 'preponed'
+          : stop.departureDelay == 0 && stop.status == 'confirmed'
+          ? 'on-time'
+          : ''
+      "
     >
       <span v-if="stop.departureDelay != 0 && stop.status == 'confirmed'">
         <s>{{ timestampToString(stop.departureScheduled) }}</s>
@@ -78,6 +98,10 @@ $stopDefaultClr: #252525;
 $stopNameClr: #22a8d1;
 
 .stop-label {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+
   &[data-sbl='true'] {
     .date {
       display: none;
@@ -90,10 +114,6 @@ $stopNameClr: #22a8d1;
     }
   }
 
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-
   .name {
     background: $stopNameClr;
     padding: 0.3em 0.5em;
@@ -112,18 +132,22 @@ $stopNameClr: #22a8d1;
   }
 
   .stop {
-    &.ph,
-    &.ph-pm,
-    &.pm {
+    &[data-stop-types='ph'],
+    &[data-stop-types='ph-pm'],
+    &[data-stop-types='pm'] {
       background: $stopExchangeClr;
     }
 
     background: $stopDefaultClr;
+
+    &[data-stop-status='delayed'] {
+      color: $delayedClr;
+    }
   }
 
   .arrival,
   .departure {
-    &.delayed {
+    &[data-status='delayed'] {
       s {
         color: #999;
       }
@@ -133,7 +157,7 @@ $stopNameClr: #22a8d1;
       }
     }
 
-    &.preponed {
+    &[data-status='preponed'] {
       s {
         color: #999;
       }
diff --git a/src/locales/en.json b/src/locales/en.json
index 2a4a4f5..c918dd9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -12,7 +12,7 @@
     "p4": "Every person who decides to contribute at least {b1} (in case of PayPal it must be a payment including additional transaction fees) for the development of Stacjownik, will receive (upon a personal request) {img}{b2} of username in the app and on my Discord server (after verifying the payment author, preferably by providing the username directly with the payment).",
     "p4-b1": "5 PLN",
     "p4-b2": "a symbolic highlight",
-    "p5": "Thank you and enjoy the app!<br />~ Spythegre",
+    "p5": "Thank you and enjoy the app!<br />~ Spythere",
     "action-exit": "Maybe next time...",
     "action-paypal": "DONATE WITH PAYPAL",
     "action-buycoffee": "BUY ME A COFFEE!",