diff --git a/api/templates/route.html b/api/templates/route.html
index 213bbf9..1684adf 100644
--- a/api/templates/route.html
+++ b/api/templates/route.html
@@ -1,33 +1,5 @@
 {%- import "route_symbol.html" as scope -%}
 <style>
-.train-direction-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-family: mono;
-  font-size: 14px;
-}
-
-.train-direction-table th,
-.train-direction-table td {
-  border: 1px solid #000;
-  padding: 4px 8px;
-  text-align: left;
-  cursor: pointer;
-}
-
-.train-direction-table th {
-  background-color: #f0f0f0;
-  font-weight: bold;
-}
-
-.highlight-row td,
-.highlight-row th {
-  background-color: #d0ebff !important;
-}
-
-.highlight-col {
-  background-color: #d0ebff !important;
-}
 </style>
 
 <script>
diff --git a/api/templates/stop.html b/api/templates/stop.html
index 8b6f871..b45e398 100644
--- a/api/templates/stop.html
+++ b/api/templates/stop.html
@@ -49,14 +49,17 @@
         <td>
             <p>{{ trip.perspective_stop.platform.name }}</p>
         </td>
-        {% if trip.is_tracked %}
+        {%  if let Tracked(tracked_trip) = trip.trip.tracking_data %}
         <td style="color: #008800">
+            <p style="font-size: small;">{{ (trip.perspective_stop.arrival_time + (tracked_trip.delay * 60.0) as i64)  | format_time }}</p>
+            <p style="font-size: x-small;  font-style: italic;">{{ ( (trip.perspective_stop.arrival_time + (tracked_trip.delay * 60.0) as i64) - current_time) / 60 }} mins</p>
+        </td>
         {% else %}
         <td>
-        {% endif %}
             <p style="font-size: small;">{{ trip.perspective_stop.arrival_time | format_time }}</p>
             <p style="font-size: x-small;  font-style: italic;">{{ (trip.perspective_stop.arrival_time - current_time) / 60 }} mins</p>
         </td>
+        {% endif %}
         {%  if let Tracked(tracked_trip) = trip.trip.tracking_data %}
             <td>
                 {{  tracked_trip.vehicle_ids.join(", ") }}