diff --git a/api/src/templates.rs b/api/src/templates.rs
index 842d100..c2dad4f 100644
--- a/api/src/templates.rs
+++ b/api/src/templates.rs
@@ -82,7 +82,7 @@ pub fn build_timetables(
         });
 
         for trip in direction_trips.clone() {
-            if let Some(last) = trip.schedule.last() {
+            if let Some(last) = trip.schedule.iter().max_by_key(|x| x.arrival_time) {
                 if next_id == None && i64::from(seconds_since_midnight) < last.arrival_time {
                     next_id = Some(last.trip_id.clone());
                 }
diff --git a/api/templates/route.html b/api/templates/route.html
index a75dbd1..f3a1574 100644
--- a/api/templates/route.html
+++ b/api/templates/route.html
@@ -33,17 +33,33 @@
 <script>
 
 document.addEventListener("DOMContentLoaded", () => {
-document.querySelectorAll("details[data-direction-id]").forEach(details => {
+  const scrollToNextColumn = (directionId) => {
+    const target = document.getElementById("next-col-" + directionId);
+    if (target) {
+      const scrollContainer = target.closest(".tscroll");
+      const firstCol = scrollContainer.querySelector("th:first-child");
+      const firstColWidth = firstCol ? firstCol.offsetWidth : 0;
+      
+      // Get the target's position relative to the scroll container
+      const targetLeft = target.offsetLeft;
+      
+      // Scroll so the target appears right after the sticky column
+      scrollContainer.scrollLeft = targetLeft - firstColWidth;
+    }
+  };
+
+  document.querySelectorAll("details[data-direction-id]").forEach(details => {
+    const directionId = details.getAttribute("data-direction-id");
+    
+    // Scroll immediately if details is already open
+    if (details.open) {
+      setTimeout(() => scrollToNextColumn(directionId), 50);
+    }
+    
+    // Also scroll when details is opened
     details.addEventListener("toggle", () => {
       if (details.open) {
-        // Delay scroll until DOM is expanded/rendered
-        setTimeout(() => {
-          const directionId = details.getAttribute("data-direction-id");
-          const target = document.getElementById("next-col-" + directionId);
-          if (target) {
-            target.scrollIntoView({ behavior: "smooth", inline: "start", block: "nearest" });
-          }
-        }, 50); // Short delay to allow rendering
+        setTimeout(() => scrollToNextColumn(directionId), 50);
       }
     });
   });