--- a/templates/stop_display.html	Mon Mar 05 12:47:40 2018 +0200
+++ b/templates/stop_display.html	Mon Mar 05 12:56:42 2018 +0200
@@ -19,17 +19,11 @@
 	
 	.next-leave td
 	{
-		height: 30vh;
+		height: 12vh;
 		vertical-align: middle;
 	}
 	
-	.next-leave-list
-	{
-		width: 100%;
-	}
-	
 	.next-leave-time,
-	.next-leave-places li.next-leave-destination,
 	.next-leave-route
 	{
 		font-weight: bold;
@@ -41,7 +35,7 @@
 		text-align: left;
 	}
 	
-	.next-leave-route
+	.next-leave-route .route-symbol
 	{
 		border: 0.5vmin solid black;
 		border-radius: 100%;
@@ -50,6 +44,11 @@
 		min-height: 12vmin;
 		text-align: center;
 		background: #ffd90f;
+	} 
+
+	.next-leave, .next-leave table
+	{
+		width: 100%;
 	}
 	
 	.next-leave-places
@@ -61,8 +60,9 @@
 	{
 		list-style: none;
 		font-size: 6vmin;
-		padding-top: 1vw;
 		font-weight: normal;
+		float: left;
+		padding-left: 10pt;
 	}
 	
 	#other-leaves
@@ -89,6 +89,13 @@
 		text-align: center;
 	}
 	
+	.next-leave-destination
+	{
+		font-size: 7vh;
+		font-weight: bold;
+		text-align: left;
+	}
+	
 	.other-leave-time
 	{
 		width: 30%;
@@ -223,10 +230,7 @@
 <body onload='cycle_leaves()'>
 	<h1><img src="../static/pysäkki.png" height="128" /><span id='stop-name'>{{ref}} {{name}}</span></h1>
 	<div class='next-leave'>
-	<ul class='next-leave-list'>
 	{% for schedule_entry in schedule[:num_imminent_leaves] %}
-	<li id="leave-{{schedule_entry['index']}}">
-	
 	<table>
 	<tr>
 	<td class='next-leave-time'>
@@ -236,24 +240,26 @@
 	{{schedule_entry['time']}}&#8203;
 	{% endif %}
 	</td>
-	<td rowspan="2">
+	<td class='next-leave-route'>
+		<span class='route-symbol'>{{schedule_entry['route']}}</span>
+	</td>
+	</tr>
+	
+	<tr>
+	<td colspan="2" class='next-leave-destination'>{{schedule_entry['sign']['destination']}}</td>
+	</tr>
+	
+	<tr>
+	<td>
 	<ul class="next-leave-places">
-		<li class='next-leave-destination'>
-			{{schedule_entry['sign']['destination']}}</li>
-		{% for entry in schedule_entry['sign']['via'] %}
-			<li>{{entry}}</li>
-		{% endfor %}
+	{% for entry in schedule_entry['sign']['via'] %}
+		<li>{{entry}}</li>
+	{% endfor %}
 	</ul>
 	</td>
 	</tr>
-	<tr>
-	<td><span class='next-leave-route'>{{schedule_entry['route']}}</span></td>
-	</tr>
 	</table>
-	
-	</li>
 	{% endfor %}
-	</ul>
 	</div>
 	{% if schedule[num_imminent_leaves] %}
 	<div id='other-leaves'>