diff --git a/server/templates/history.html b/server/templates/history.html
index 71f4790..7a31935 100644
--- a/server/templates/history.html
+++ b/server/templates/history.html
@@ -67,7 +67,7 @@
                      data-tile-attrib="&copy; <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors &copy; <a href='https://carto.com/attributions'>CARTO</a>"
                      data-min-zoom="3" data-max-zoom="19"></div>
                 <div id="trip-timeline" class="border-top p-3" hidden>
-                    <div class="d-flex align-items-center gap-3 mb-2">
+                    <div class="d-flex align-items-center gap-3 mb-3">
                         <button id="trip-play" class="btn btn-primary btn-sm" type="button" aria-label="Play">
                             <i class="fas fa-play" aria-hidden="true"></i>
                         </button>
@@ -81,13 +81,15 @@
                         </div>
                     </div>
                     <div class="d-flex flex-wrap justify-content-between gap-2 small mt-2">
-                        <strong id="trip-replay-time"></strong>
+                        <div class="min-w-0">
+                            <strong id="trip-replay-time" class="d-block"></strong>
+                            <span id="trip-replay-location" class="text-muted" style="font-size:0.75rem;"></span>
+                        </div>
                         <div class="text-end">
                             <span id="trip-replay-speed" class="text-muted d-block"></span>
                             <span id="trip-replay-odometer" class="text-muted d-block" style="font-size:0.75rem;"></span>
                         </div>
                     </div>
-                    <div id="trip-replay-location" class="text-muted mt-1" style="font-size:0.75rem;min-height:1rem"></div>
                 </div>
             </div>
         </div>
diff --git a/static/js/history.js b/static/js/history.js
index ac88296..c1013e6 100644
--- a/static/js/history.js
+++ b/static/js/history.js
@@ -168,8 +168,14 @@
         }
         var ratio = st.maxIndex / (st.points.length - 1);
         var thumb = 16; // approximate range thumb width
-        var usable = Math.max(1, scrubber.clientWidth - thumb);
-        tick.style.left = (thumb / 2 + ratio * usable) + "px";
+        var w = scrubber.clientWidth;
+        var usable = Math.max(1, w - thumb);
+        var x = thumb / 2 + ratio * usable;
+        // Keep the centered label inside the scrubber so it doesn't overlap the
+        // time (left) or speed (right) readouts when max speed is at an edge.
+        var halfLabel = 24;
+        x = Math.max(halfLabel, Math.min(w - halfLabel, x));
+        tick.style.left = x + "px";
         tick.hidden = false;
     }
 
diff --git a/templates/history.html b/templates/history.html
index 14cffbe..595a088 100644
--- a/templates/history.html
+++ b/templates/history.html
@@ -64,7 +64,7 @@
                 <div id="history-map" aria-label="Selected trip route map"
                      data-min-zoom="8" data-max-zoom="15"></div>
                 <div id="trip-timeline" class="border-top p-3" hidden>
-                    <div class="d-flex align-items-center gap-3 mb-2">
+                    <div class="d-flex align-items-center gap-3 mb-3">
                         <button id="trip-play" class="btn btn-primary btn-sm" type="button" aria-label="Play">
                             <i class="fas fa-play" aria-hidden="true"></i>
                         </button>
@@ -78,13 +78,15 @@
                         </div>
                     </div>
                     <div class="d-flex flex-wrap justify-content-between gap-2 small mt-2">
-                        <strong id="trip-replay-time"></strong>
+                        <div class="min-w-0">
+                            <strong id="trip-replay-time" class="d-block"></strong>
+                            <span id="trip-replay-location" class="text-muted" style="font-size:0.75rem;"></span>
+                        </div>
                         <div class="text-end">
                             <span id="trip-replay-speed" class="text-muted d-block"></span>
                             <span id="trip-replay-odometer" class="text-muted d-block" style="font-size:0.75rem;"></span>
                         </div>
                     </div>
-                    <div id="trip-replay-location" class="text-muted mt-1" style="font-size:0.75rem;min-height:1rem"></div>
                 </div>
             </div>
         </div>