diff --git a/templates/cave.html b/templates/cave.html
index 0d91769..2996736 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -106,15 +106,17 @@
     <h2>References</h2>
     {{ cave.references|safe }}
 {% endif %}
+
+{% if not local %}
 {% if cave.get_QMs %}
     <h2>QMs</h2>
     <a href="{% url 'caveQMs' cave_id|safe %}">QM page for {{ cave_id|safe }}</a> 
 {% endif %}
 
-
-<h2>Scanned survey notes</h2>
-<a href="{% url "cavewallets" cave_id %}">{{ cave_id|safe }}</a>
-  
+  <h2>Scanned survey notes</h2>
+  <a href="{% url "cavewallets" cave_id %}">{{ cave_id|safe }}</a>
+{% endif %}
+ 
 {% if cave.notes %}
     <h2>Notes</h2>
     {{ cave.notes|safe }}
@@ -130,7 +132,7 @@
         {{ ent.entrance_letter|safe }}
         {% if ent.entrance.name %}
             {{ ent.entrance.name|safe }}
-        {% endif %}<a class="editlink" href="{% url "editentrance" ent.entrance.url_parent cave.slug ent.entrance.slug %}">Edit</a>
+        {% endif %}<a class="editlink" href="{% if local %}https://expo.survex.com{% endif %}{% url "editentrance" ent.entrance.url_parent cave.slug ent.entrance.slug %}">Edit</a>
         <dl>
         {% if ent.entrance.marking %}
             <dt>Marking</dt><dd>{{ ent.entrance.marking_val|safe }}</dd>
@@ -190,7 +192,7 @@
     </ul>
 
 {% endif %}</p>
-<a class="editlink" href="{% url "newentrance" cave.url_parent cave.slug %}">New Entrance</a>
+<a class="editlink" href="{% if local %}https://expo.survex.com{% endif %}{% url "newentrance" cave.url_parent cave.slug %}">New Entrance</a>
 </div>
     <h2>Survex File(s)</h2>
     All <a href="/survexfile/{{cave.kataster_number}}">survexfiles</a> for this cave <br />
diff --git a/templates/entrance_html.kml b/templates/entrance_html.kml
index 48c694d..902102c 100644
--- a/templates/entrance_html.kml
+++ b/templates/entrance_html.kml
@@ -1,5 +1,5 @@
 <dl>
-        <a href="/{{entrance.cavelist.0.url }}">Cave: {{entrance.cavelist.0.name }}</a>
+        <a href="/{{entrance.cavelist.0.url }}">Cave: {{entrance.cavelist.0 }}</a>
         {% if entrance.marking %}
             <dt>Marking</dt><dd>{{ entrance.marking_val|safe }}</dd>
         {% endif %}
diff --git a/templates/menu.html b/templates/menu.html
index 3014dce..8ef5bff 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -42,8 +42,8 @@
 <li><form name=P method=get action="/search" target="_top">
     <input id="omega-autofocus" type=search name=P size=8 autofocus>
     <input type=submit value="Search"></form></li>
-{% if editable %}<li><a href="{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %}
-{% if cave_editable %}<li><a href="{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %}
+{% if editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %}
+{% if cave_editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %}
 </ul>
 </div>
 {% endif %}