diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index a1ac08e..7219b9e 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -198,14 +198,12 @@
 				<p>Ziel wählen:</p>
 				<table>
 					<tbody>
-						% my $is_after = 0;
 						% for my $station (@{$journey->{route_after}}) {
-							% if ($journey->{arr_name} and $station->[0] eq $journey->{arr_name}) {
-								<tr><td><b><a class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %></a></b></td></tr>
-							% }
-							% else {
-								<tr><td><a class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %></a></td></tr>
-							% }
+							<tr><td><a class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %>
+								% if ($station->[1]{rt_arr}) {
+									<span style="float: right;"><%= $station->[1]{rt_arr}->strftime('%H:%M') %></span>
+								% }
+							</a></td></tr>
 						% }
 					</tbody>
 				</table>
@@ -246,14 +244,13 @@
 				<span class="card-title">Ziel ändern?</span>
 				<table>
 					<tbody>
-						% my $is_after = 0;
 						% for my $station (@{$journey->{route_after}}) {
-							% if ($journey->{arr_name} and $station->[0] eq $journey->{arr_name}) {
-								<tr><td><b><a class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %></a></b></td></tr>
-							% }
-							% else {
-								<tr><td><a class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %></a></td></tr>
-							% }
+							% my $is_dest = ($journey->{arr_name} and $station->[0] eq $journey->{arr_name});
+							<tr><td><a style="<%= $is_dest? 'font-weight: bold;' : '' %>" class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %>
+								% if ($station->[1]{rt_arr}) {
+									<span style="float: right;"><%= $station->[1]{rt_arr}->strftime('%H:%M') %></span>
+								% }
+							</a></td></tr>
 						% }
 					</tbody>
 				</table>