diff --git a/templates/cave.html b/templates/cave.html
index 41b292a..b76cc25 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -162,19 +162,19 @@
             <dt>Location</dt><dd>?BMN? Northing: {{ ent.entrance.northing|safe }}, Easting: {{ ent.entrance.easting|safe }}, {{ ent.entrance.alt|safe }}m</dd>
         {% endif %}
         {% if ent.entrance.tag_station %}
-            <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} UTM33 {{ ent.entrance.tag.y|floatformat:0 }}, {{ ent.entrance.tag.x|floatformat:0 }}, {{ ent.entrance.tag.z|floatformat:0 }}m</dd>
+            <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} {{ ent.entrance.tag.latlong.0|floatformat:5 }}N {{ ent.entrance.tag.latlong.1|floatformat:5 }}E (UTM33 {{ ent.entrance.tag.y|floatformat:0 }}, {{ ent.entrance.tag.x|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m</dd>
         {% endif %}
         {% if ent.entrance.bearings %}
             <dt>Bearings</dt><dd>{{ ent.entrance.bearings|safe }}</dd>
         {% endif %}
         {% if ent.entrance.exact_station %}
-            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} UTM33 {{ ent.entrance.exact_location.y|floatformat:0 }}, {{ ent.entrance.exact_location.x|floatformat:0 }}, {{ ent.entrance.exact_location.z|floatformat:0 }}m</dd>
+            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} {{ ent.entrance.exact_location.latlong.0|floatformat:5 }}N {{ ent.entrance.exact_location.latlong.1|floatformat:5 }}E (UTM33 {{ ent.entrance.exact_location.y|floatformat:0 }}, {{ ent.entrance.exact_location.x|floatformat:0 }}), {{ ent.entrance.exact_location.z|floatformat:0 }}m</dd>
         {% endif %}
         {% if ent.entrance.other_station %}
             <dt>Other Station</dt><dd>{{ ent.entrance.other_station|safe }}
         {% if ent.entrance.other_description %}
             - {{ ent.entrance.other_description|safe }}
-        {% endif %} UTM33 {{ ent.entrance.other_location.y|floatformat:0 }}, {{ ent.entrance.other_location.x|floatformat:0 }}, {{ ent.entrance.other_location.z|floatformat:0 }}m
+        {% endif %}  {{ ent.entrance.other_location.latlong.0|floatformat:5 }}N {{ ent.entrance.other_location.latlong.1|floatformat:5 }}E (UTM33 {{ ent.entrance.other_location.y|floatformat:0 }}, {{ ent.entrance.other_location.x|floatformat:0 }}), {{ ent.entrance.other_location.z|floatformat:0 }}m
         </dd>
         {% endif %}
           </dl>