diff --git a/index.html b/index.html
index e5c2942..8266737 100644
--- a/index.html
+++ b/index.html
@@ -22,14 +22,19 @@
     <h2>{{ .Name }}</h2>
     <p>{{ .Town }}</p>
 
-    <dl>
-    {{ range $i, $val := .Departures }}
+    <table>
+      <tbody>
+      {{ range $i, $val := .Departures }}
       {{ if lt $i 3 }}
-      <dt>{{ $val.RouteShortName }} | {{ $val.StopHeadsign }}</dt>
-      <dd><time>{{ formatTime $val.DepartureTime }}</time></dd>
+      <tr>
+        <td>{{ $val.RouteShortName }}</td>
+        <td>{{ $val.StopHeadsign }}</td>
+        <td><time>{{ formatTime $val.DepartureTime }}</time></td>
+      </tr>
       {{ end }}
-    {{ end }}
-    </dl>
+      {{ end }}
+      </tbody>
+    </table>
   </article>
   {{ end }}
 </main>
diff --git a/static/css/busdepartures.css b/static/css/busdepartures.css
index d3fcd7c..bd310cf 100644
--- a/static/css/busdepartures.css
+++ b/static/css/busdepartures.css
@@ -22,20 +22,6 @@ p {
     margin-top: 0;
 }
 
-dt {
-    display: inline-block;
-    font-weight: bold;
-}
-
-dd {
-    display: inline;
-}
-
-dd::after {
-    content: "\A";
-    white-space: pre;
-}
-
 header {
     background: #000;
     color: #fff;
@@ -45,4 +31,16 @@ header {
 
 main {
     padding: 1rem 2rem;
+}
+
+td {
+    padding: .2rem .8rem;
+}
+
+td:first-child {
+    padding-left: 0;
+}
+
+td:last-child {
+    padding-right: 0;
 }
\ No newline at end of file