diff --git a/src/components/JournalView/JournalTimetables/EntryGeneral.vue b/src/components/JournalView/JournalTimetables/EntryGeneral.vue
index 7ce7975..3c21cf9 100644
--- a/src/components/JournalView/JournalTimetables/EntryGeneral.vue
+++ b/src/components/JournalView/JournalTimetables/EntryGeneral.vue
@@ -3,8 +3,24 @@
     <span class="general-train">
       <span class="text--grayed">#{{ timetable.id }}</span>
 
-      <span class="train-badge twr" v-if="timetable.twr" :title="$t('general.TWR')">TWR</span>
-      <span class="train-badge skr" v-if="timetable.skr" :title="$t('general.SKR')">SKR</span>
+      <span
+        class="train-badge twr"
+        v-if="timetable.twr"
+        data-tooltip-type="BaseTooltip"
+        :data-tooltip-content="
+          $t('general.TWR') + `${timetable.warningNotes ? ':\n' + timetable.warningNotes : ''}`
+        "
+      >
+        TWR
+      </span>
+      <span
+        class="train-badge skr"
+        v-if="timetable.skr"
+        data-tooltip-type="BaseTooltip"
+        :data-tooltip-content="$t('general.SKR')"
+      >
+        SKR
+      </span>
 
       <span>
         <strong
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 6b5f8a1..2d3bc8f 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -21,7 +21,7 @@
   --clr-donator: #f7a4ff;
 
   --no-scroll-padding: 17px;
-  --max-container-width: 2000px;
+  --max-container-width: 1700px;
 
   font-size: 16px;
 }
diff --git a/src/views/DriverView.vue b/src/views/DriverView.vue
index 4bd13b4..01eeb02 100644
--- a/src/views/DriverView.vue
+++ b/src/views/DriverView.vue
@@ -109,7 +109,7 @@ $viewBgCol: #1a1a1a;
 .driver-view {
   margin: 0 auto;
   padding: 1em 0;
-  max-width: 2000px;
+  max-width: var(--max-container-width);
   min-height: calc(100vh - 7em);
 }