diff --git a/templates/checkin.html.ep b/templates/checkin.html.ep
index 96cd80f..7e68a0b 100644
--- a/templates/checkin.html.ep
+++ b/templates/checkin.html.ep
@@ -35,13 +35,20 @@
 	<div class="row">
 		<div class="col s12">
 			Weitere Route:
-			<ul>
-			% for my $station ($train->route_post) {
-				<li><%= $station %>
-					(<a href="/a/checkout?station=<%= $station %>">hier auschecken</a>)
-				</li>
-			% }
-			</ul>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col s12">
+			<table>
+				<tbody>
+					% for my $station ($train->route_post) {
+						<tr>
+							<td><%= $station %></td>
+							<td><a href="/a/checkout?station=<%= $station %>">hier auschecken</a></td>
+						</tr>
+					% }
+				</tbody>
+			</table>
 		</div>
 	</div>
 % }
diff --git a/templates/landingpage.html.ep b/templates/landingpage.html.ep
index 2190862..0207118 100644
--- a/templates/landingpage.html.ep
+++ b/templates/landingpage.html.ep
@@ -8,14 +8,15 @@
 					<p>Du bist gerade eingecheckt in
 						<%= $status->{train_type} %> <%= $status->{train_no} %>
 						ab <%= $status->{station_name} %>.</p>
-					<p>Auschecken?
-						<ul>
+					<p>Auschecken?</p>
+					<table>
+						<tbody>
 							% my $is_after = 0;
 							% for my $station (@{$status->{route_after}}) {
-								<li><a href="/a/checkout?station=<%= $station %>"><%= $station %></a></li>
+								<tr><td><a href="/a/checkout?station=<%= $station %>"><%= $station %></a></td></tr>
 							% }
-						</ul>
-					</p>
+						</tbody>
+					</table>
 				</div>
 			</div>
 		% }