diff --git a/src/locales/en.json b/src/locales/en.json
index 71df3af..fa92d66 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -404,7 +404,7 @@
     "timeout": "An error occured while trying to refresh SWDR timetable data!",
 
     "driver-journal-link": "DRIVER JOURNAL",
-    "driver-return-link": "MAIN SITE",
+    "driver-return-link": "GO BACK",
 
     "driver-not-found-header": "Train not found! :/",
     "driver-not-found-desc-1": "This train has already been terminated or it's offline.",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 3241ef7..86815a9 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -390,7 +390,7 @@
     "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR",
 
     "driver-journal-link": "DZIENNIK MASZYNISTY",
-    "driver-return-link": "STRONA GŁÓWNA",
+    "driver-return-link": "POWRÓT",
 
     "driver-not-found-header": "Nie znaleziono pociągu! :/",
     "driver-not-found-desc-1": "Ten pociąg prawdopodobnie zakończył już swój bieg lub jest offline.",
diff --git a/src/router/index.ts b/src/router/index.ts
index 71acc24..53ec168 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -7,7 +7,7 @@ const routes: Array<RouteRecordRaw> = [
     component: () => import('../views/StationsView.vue'),
     props: (route) => ({
       region: route.query.region
-    }),
+    })
   },
   {
     path: '/trains',
@@ -56,7 +56,7 @@ const routes: Array<RouteRecordRaw> = [
     component: () => import('../views/JournalDispatchers.vue'),
     props: (route) => ({
       region: route.query.region
-    }),
+    })
   },
   {
     path: '/:catchAll(.*)',
@@ -79,4 +79,10 @@ const router = createRouter({
   routes
 });
 
+router.beforeEach((to, from, next) => {
+  next((vm) => {
+    (vm as any)['xd'] = 'xd';
+  });
+});
+
 export default router;
diff --git a/src/views/DriverView.vue b/src/views/DriverView.vue
index d50342a..2ddf9a9 100644
--- a/src/views/DriverView.vue
+++ b/src/views/DriverView.vue
@@ -3,18 +3,14 @@
     <div class="view-wrapper">
       <div v-if="chosenTrain">
         <div class="actions">
-          <router-link to="/" class="a-button btn--image">
-            <img src="/images/icon-back.svg" alt="train icon" />
-            <span>{{ $t('trains.driver-return-link') }}</span>
-          </router-link>
           <router-link
             :to="`/journal/timetables?search-driver=${chosenTrain.driverName}`"
             class="a-button btn--image"
           >
-            <img src="/images/icon-train.svg" alt="train icon" />
             <span class="hidable">
               {{ $t('trains.driver-journal-link') }}
             </span>
+            <img src="/images/icon-train.svg" alt="train icon" />
           </router-link>
         </div>
 
@@ -43,7 +39,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, onActivated, onMounted, useAttrs } from 'vue';
 import TrainInfo from '../components/TrainsView/TrainInfo.vue';
 import TrainSchedule from '../components/TrainsView/TrainSchedule.vue';
 import Loading from '../components/Global/Loading.vue';
@@ -68,6 +64,10 @@ const apiStore = useApiStore();
 const chosenTrain = computed(() =>
   mainStore.trainList.find((train) => train.id == props.trainId || train.modalId == props.modalId)
 );
+
+onActivated(() => {
+  console.log();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -85,7 +85,7 @@ $viewBgCol: #1a1a1a;
 .actions {
   display: flex;
   align-items: flex-end;
-  justify-content: space-between;
+  justify-content: flex-end;
   gap: 0.5em;
 }
 
@@ -101,6 +101,7 @@ $viewBgCol: #1a1a1a;
 
 .train-card {
   background-color: $viewBgCol;
+  border-radius: 0 0 0.5em 0.5em;
 }
 
 .driver-not-found {