diff --git a/templates/accommodation.html b/templates/accommodation.html
index a7f9b21..29e5bfa 100644
--- a/templates/accommodation.html
+++ b/templates/accommodation.html
@@ -21,10 +21,10 @@
 
 {% macro row(item, badge) %}
 {% set country = get_country(item.country) %}
+{% set nights = (item.to.date() - item.from.date()).days %}
 <div class="grid-item text-end">{{ item.from.strftime("%a, %d %b %Y") }}</div>
 <div class="grid-item text-end">{{ item.to.strftime("%a, %d %b") }}</div>
-<div class="grid-item text-end">{{ (item.to.date() - item.from.date()).days }}</div>
-<div class="grid-item">{{ item.name }}</div>
+<div class="grid-item text-end">{% if nights == 1 %}1 night{% else %}{{ nights }} nights{% endif %}</div>
 <div class="grid-item">{{ item.operator }}</div>
 <div class="grid-item">{{ item.location }}</div>
 <div class="grid-item">
@@ -36,6 +36,13 @@
     </span>
   {% endif %}
 </div>
+<div class="grid-item">
+  {% if item.url %}
+    <a href="{{ item.url }}">{{ item.name }}</a>
+  {% else %}
+    {{ item.name }}
+  {% endif %}
+</div>
 {% endmacro %}
 
 {% macro section(heading, item_list, badge) %}