diff --git a/templates/scanuploadform.html b/templates/scanuploadform.html
index 68e6f98..71b30c6 100644
--- a/templates/scanuploadform.html
+++ b/templates/scanuploadform.html
@@ -4,7 +4,12 @@
 
 {% block content %}
 
-<h2>Upload scan into wallet {{wallet}}</h2>
+{% if user.username %}
+<h2>Wallet {{wallet}} - edit settings or upload a file</h2>
+{% else %}
+<h2>Wallet {{wallet}}</h2>
+{% endif %}
+
 <p style="font-family: monospace; font-weight: bold; font-size: 130%; text-align: center">
 <a style="font-weight: normal;" href="/scanupload/{{prevy}}:01">{{prevy}}</a>
 &nbsp;...&nbsp;
@@ -42,7 +47,7 @@
 {% for f in files %}
 <a href="/expofiles/surveyscans/{{year}}/{{wallet|urlencode}}/{{f}}">{{ f}}</a><br />
     {% empty %}
-    <p>&lt;No files here&gt;
+    <p>&lt;No files in this wallet.&gt;
 {% endfor %}
 </p>
     {% if create %}
@@ -51,19 +56,38 @@
     {% endif %}
 
 <p><em>
-<a href="/expofiles/surveyscans/{{year}}/{{wallet|urlencode}}/walletindex.html">Wallet status page</a>
+<a href="/expofiles/surveyscans/{{year}}/walletindex.html">Wallet index for this year</a> (old script, being replaced...)
 <br />
-<a href="/expofiles/surveyscans/{{year}}/walletindex.html">Wallet index for this year</a>
-<br />
-<a href="/expedition/{{year}}">Logbook entries, Survex files for this year</a>
+<a href="/expedition/{{year}}">Logbook entries, people, Survex files for {{year}}</a>
 </em>
 
+
+
 </div> 
+{% if complaints %}
+<h3 style="text-align: left; color: red">Complaints</h3>
+    <ul style="list-style-type: disc; color: red">
+    {% for cmp in complaints%}
+    <li>{{cmp}}
+    {% endfor %}
+    </ul>
+
+{% if user.username %}
+{% else %}
+<p>You will need to log in to the website (top right menu bar) to be able to edit the settings on this wallet.
+{% endif %}
+
+{% endif %}
 <hr />
     {% if not create %}
     <br>
     <span style="font-family: monospace;  font-size: 150%; ">
-    {% if cave %}<u>Cave ID</u>: <b>{{cave}}</b><br> {% endif %}
+    {% if cave %}<u>Cave ID</u>: 
+        {% if caveobject %}<b>{{cave}}</b></a> which implies "<a href="/{{caveobject.url}}">{{caveobject}}</a>"<br> 
+        {% else %}
+        <b>{{cave}}</b><br> 
+        {% endif %}   
+    {% endif %}
     {% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %}
     {% if svxfiles %}<u>Survey files</u>: 
             {% for svx in svxfiles%}
@@ -119,8 +143,8 @@
            <label for="elevnr">Elevation not required ?</label>
            <input type="checkbox" name="elevnr" id="elevnr" value="True" {% if "elev not required" in checked %}checked{% endif %}>
     <br>
-           <label for="survexvnr">Survex file not required ?</label>
-           <input type="checkbox" name="survexvnr" id="survexvnr" value="True" {% if "survex not required" in checked %}checked{% endif %}>
+           <label for="survexnr">Survex file not required ?</label>
+           <input type="checkbox" name="survexnr" id="survexnr" value="True" {% if "survex not required" in checked %}checked{% endif %}>
     <br>
            <label for="pland">Plan drawn ?</label>
            <input type="checkbox" name="pland" id="pland" value="True" {{chkpland}} {% if "plan drawn" in checked %}checked{% endif %}>