diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index b220000..62c9e78 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -260,17 +260,17 @@
 			% }
 		</div>
 	</div>
-	<div class="row" style="margin-top: 2em;">
-		<div class="col s6 center-align">
-			% my $url = 'https://marudor.de/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000';
-			<a href="<%= $url %>" class="waves-effect waves-light btn"><i class="material-icons left">timeline</i> Zuglauf</a>
-		</div>
-		<div class="col s6 center-align">
-			% if ($journey->{extra_data}{trip_id}) {
-				<a href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} %>/<%= $journey->{train_line} || 0 %>" class="waves-effect waves-light btn"><i class="material-icons left">map</i> Karte</a>
-			% }
-		</div>
-	</div>
+%#	<div class="row" style="margin-top: 2em;">
+%#		<div class="col s6 center-align">
+%#			% my $url = 'https://marudor.de/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000';
+%#			<a href="<%= $url %>" class="waves-effect waves-light btn"><i class="material-icons left">timeline</i> Zuglauf</a>
+%#		</div>
+%#		<div class="col s6 center-align">
+%#			% if ($journey->{extra_data}{trip_id}) {
+%#				<a href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} %>/<%= $journey->{train_line} || 0 %>" class="waves-effect waves-light btn"><i class="material-icons left">map</i> Karte</a>
+%#			% }
+%#		</div>
+%#	</div>
 	% if ($journey->{arr_name}) {
 		<div class="card" style="margin-top: 3em;">
 			<div class="card-content">
diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep
index 751a14b..2c5c3df 100644
--- a/templates/_public_status_card.html.ep
+++ b/templates/_public_status_card.html.ep
@@ -140,15 +140,11 @@
 				</p>
 			% }
 		</div>
-	</div>
-	<div class="row">
-		<div class="col s6 center-align">
+		<div class="card-action">
 			% my $url = 'https://marudor.de/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000';
-			<a href="<%= $url %>" class="waves-effect waves-light btn"><i class="material-icons left">timeline</i> Zuglauf</a>
-		</div>
-		<div class="col s6 center-align">
+			<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left">timeline</i> Zuglauf</a>
 			% if ($journey->{extra_data}{trip_id}) {
-				<a href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} %>/<%= $journey->{train_line} || 0 %>" class="waves-effect waves-light btn"><i class="material-icons left">map</i> Karte</a>
+				<a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} %>"><i class="material-icons left">map</i> Karte</a>
 			% }
 		</div>
 	</div>