diff --git a/templates/macros.html b/templates/macros.html
index f0ca499..57b3f44 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -279,6 +279,47 @@ https://www.flightradar24.com/data/flights/{{ flight.airline_detail.iata | lower
   </div>
 {% endmacro %}
 
+{% macro bus_row(item) %}
+  {% set url = item.url %}
+  <div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
+  <div class="grid-item">
+    {% if g.user.is_authenticated and item.url %}<a href="{{ url }}">{% endif %}
+      {{ item.from }} → {{ item.to }}
+    {% if g.user.is_authenticated and item.url %}</a>{% endif %}
+  </div>
+  <div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
+  <div class="grid-item">
+    {% if item.arrive %}
+      {{ item.arrive.strftime("%H:%M") }}
+      {% if item.depart != item.arrive and item.arrive.date() != item.depart.date() %}+1 day{% endif %}
+    {% endif %}
+  </div>
+  <div class="grid-item">{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</div>
+  <div class="grid-item">{{ item.operator }}</div>
+  <div class="grid-item">
+    {% if g.user.is_authenticated %}
+      {{ item.booking_reference }}
+    {% else %}
+      <em>redacted</em>
+    {% endif %}
+  </div>
+  <div class="grid-item">
+  </div>
+  <div class="grid-item text-end">
+    {% if item.distance %}
+      {{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
+    {% endif %}
+  </div>
+  <div class="grid-item text-end">
+    {% if g.user.is_authenticated and item.price and item.currency %}
+      <span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
+      {% if item.currency != "GBP" and item.currency in fx_rate %}
+        <span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
+      {% endif %}
+    {% endif %}
+  </div>
+{% endmacro %}
+
 {% macro ferry_row(item) %}
   <div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
   <div class="grid-item">
diff --git a/templates/trip_page.html b/templates/trip_page.html
index 531c0ba..dbc3377 100644
--- a/templates/trip_page.html
+++ b/templates/trip_page.html
@@ -2,9 +2,9 @@
 
 {% block title %}{{ trip.title }} ({{ display_date(trip.start) }}) - Edward Betts{% endblock %}
 
-{% from "macros.html" import trip_link, display_datetime, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row, ferry_row, coach_row with context %}
+{% from "macros.html" import trip_link, display_datetime, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row, ferry_row, coach_row, bus_row with context %}
 
-{% set row = {"flight": flight_row, "train": train_row, "ferry": ferry_row, "coach": coach_row} %}
+{% set row = {"flight": flight_row, "train": train_row, "ferry": ferry_row, "coach": coach_row, "bus": bus_row} %}
 
 {% macro next_and_previous() %}
   <p>
@@ -271,7 +271,7 @@
               {{ item.from }}
               →
               {{ item.to }}
-            {% elif item.type == "coach" %}
+            {% elif item.type == "coach" or item.type == "bus" %}
               🚌
               {{ item.from }}
               →
@@ -322,7 +322,7 @@
                   </span>
                 {% endif %}
               </div>
-            {% elif item.type == "coach" %}
+            {% elif item.type == "coach" or item.type == "bus" %}
               <div>
                 {{ display_datetime(item.depart) }}
                 →