diff --git a/src/components/Timetable/TimetableBody.vue b/src/components/Timetable/TimetableBody.vue
index 1cac990..8a6afa4 100644
--- a/src/components/Timetable/TimetableBody.vue
+++ b/src/components/Timetable/TimetableBody.vue
@@ -11,15 +11,39 @@
         {{ i == 0 || computedTimetable[i - 1].realLine != row.realLine ? row.realLine : ' ' }}
       </td>
 
-      <td class="border border-black dark:border-white relative">
-        <div class="absolute top-0 left-0 w-full h-full p-0.5">
+      <td
+        class="border border-black dark:border-white border-t-1 border-b-1 relative p-0"
+        :class="{
+          'border-t-0':
+            i == 0 ||
+            (computedTimetable[i - 1].departureSpeed == row.arrivalSpeed &&
+              computedTimetable[i - 1].departureTracks == row.arrivalTracks &&
+              computedTimetable[i - 1].realLine == row.realLine),
+          'border-b-0': i != computedTimetable.length - 1,
+        }"
+      >
+        <div class="absolute top-0 left-0 w-full h-full">
           <table class="h-full w-full border-collapse">
             <tbody>
-              <tr>
-                <td class="align-top">{{ row.arrivalKm == '0.000' ? '' : row.arrivalKm }}</td>
+              <tr
+                class="text-transparent"
+                :class="{
+                  'align-top text-inherit':
+                    i > 0 &&
+                    (computedTimetable[i - 1].departureSpeed != row.arrivalSpeed ||
+                      computedTimetable[i - 1].departureTracks != row.arrivalTracks ||
+                      computedTimetable[i - 1].realLine != row.realLine),
+                }"
+              >
+                <td>{{ row.arrivalKm }}</td>
               </tr>
-              <tr>
-                <td class="align-bottom">{{ row.departureKm == '0.000' ? '' : row.departureKm }}</td>
+              <tr
+                :class="{
+                  'border-t align-top': row.arrivalTracks != row.departureTracks || row.departureSpeed != row.arrivalSpeed,
+                  hidden: row.arrivalTracks == row.departureTracks && row.departureSpeed == row.arrivalSpeed,
+                }"
+              >
+                <td>{{ row.departureKm == '0.000' ? '' : row.departureKm }}</td>
               </tr>
             </tbody>
           </table>
diff --git a/src/components/Timetable/TrainTimetable.vue b/src/components/Timetable/TrainTimetable.vue
index b3bb750..6db7ce7 100644
--- a/src/components/Timetable/TrainTimetable.vue
+++ b/src/components/Timetable/TrainTimetable.vue
@@ -89,7 +89,9 @@ const computedTimetableRows = computed(() => {
 
   for (const stop of stopList) {
     if (stop.arrivalLine && stop.arrivalLine == currentPath.arrivalLine) {
-      arrivalKm = stop.stopDistance;
+      console.log('arrivalKm', arrivalKm, stop.stopDistance);
+
+      if (arrivalKm >= stop.stopDistance) arrivalKm = stop.stopDistance;
 
       if (currentPath.arrivalLineData) {
         arrivalSpeed = currentPath.arrivalLineData.routeSpeed;
@@ -170,8 +172,13 @@ const computedTimetableRows = computed(() => {
 
     if (stop.departureLine && stop.departureLine == currentPath.departureLine) {
       // Reverse search for last scenery checkpoint
-      for (let i = stopRows.length - 1; i > 0; i--) {
-        if (currentPath.departureLineData) {
+      if (currentPath.departureLineData) {
+        console.log(stop.departureLine, currentPath.sceneryName, stop.stopDistance, currentPath.departureLineData.routeLength);
+
+        if (currentPath.departureLineData.isRouteSBL) arrivalKm = stop.stopDistance + (currentPath.departureLineData.routeSpeed <= 130 ? 1.0 : 2.0);
+        else arrivalKm = stop.stopDistance + currentPath.departureLineData.routeLength / 1000;
+
+        for (let i = stopRows.length - 1; i > 0; i--) {
           stopRows[i].departureTracks = currentPath.departureLineData.routeTracks;
           stopRows[i].departureSpeed = currentPath.departureLineData.routeSpeed;
           stopRows[i].realLine = currentPath.departureLineData.realLineNo?.toString() ?? '';