diff --git a/core/models/caves.py b/core/models/caves.py
index 4c0bd2ea..56a3c7ae 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -249,7 +249,6 @@ class Entrance(TroggleModel):
     lat_wgs84 = models.TextField(blank=True, null=True) # manually entered not calculated
     location_description = models.TextField(blank=True, null=True)
     long_wgs84 = models.TextField(blank=True, null=True)  # manually entered not calculated
-    # map_description = models.TextField(blank=True, null=True) # retired
     marking = models.CharField(max_length=2, choices=MARKING_CHOICES, default="?")
     marking_comment = models.TextField(blank=True, null=True)
     name = models.CharField(max_length=100, blank=True, null=True)
diff --git a/templates/caveindex.html b/templates/caveindex.html
index d8573e80..96916cd0 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -27,7 +27,7 @@ See <em><a href="/caves_undropped">Undropped Caves</a></em> for all unexplored c
 See <em> <a href="/enttags">Lost Caves</a></em> for caves we have mislaid.
 
     <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
      
     </p>
 
@@ -64,7 +64,7 @@ See <em> <a href="/enttags">Lost Caves</a></em> for caves we have mislaid.
 See <em><a href="/caves">All Caves</a></em> for all the caves in areas 1623, 1626, 1624, 1627 
  
   <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
   
   </p>
 {% endblock %}
diff --git a/templates/cavesallindex.html b/templates/cavesallindex.html
index f792e0f4..08c1b8be 100644
--- a/templates/cavesallindex.html
+++ b/templates/cavesallindex.html
@@ -27,7 +27,7 @@ See <em> <a href="/enttags">Lost Caves</a></em> for caves we have mislaid.<br />
 See <em> <a href="/caves_recent">Recent Caves</a></em> for a shorter list of recent caves.
 
     <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
         <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
     </p>
 
@@ -52,7 +52,7 @@ See <em> <a href="/caves_recent">Recent Caves</a></em> for a shorter list of rec
 </div>
 
     <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
         <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
     </p>
 
@@ -66,7 +66,7 @@ See <em> <a href="/caves_recent">Recent Caves</a></em> for a shorter list of rec
 </div>
 
   <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
     <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
   </p>
 
@@ -81,7 +81,7 @@ See <em> <a href="/caves_recent">Recent Caves</a></em> for a shorter list of rec
 </div>
 
   <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
     <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
   </p>
 
@@ -97,7 +97,7 @@ See <em> <a href="/caves_recent">Recent Caves</a></em> for a shorter list of rec
 </div>  
  
   <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
     <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
   </p>
 {% endblock %}
diff --git a/templates/cavesundropped.html b/templates/cavesundropped.html
index bcc5f88e..45b86b2e 100644
--- a/templates/cavesundropped.html
+++ b/templates/cavesundropped.html
@@ -15,7 +15,7 @@ See <em> <a href="/enttags">Lost Caves</a></em> for caves we have mislaid.<br />
 Download <em><a href="/caves_undropped_gpx" download="undropped.gpx">Undropped GPX file</a></em> (This is only the subset which are fully located.)
 
     <p style="text-align:right">
-    <a href="{% url "newcave" %}">New Cave</a><br>
+    <a href="{% url "newhole" %}">New Cave</a><br>
         <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
     </p>
 
diff --git a/templates/controlPanel.html b/templates/controlPanel.html
index 7853c384..11ad53bb 100644
--- a/templates/controlPanel.html
+++ b/templates/controlPanel.html
@@ -4,6 +4,7 @@
 <img class = "onright" alt="troggle logo" src="/handbook/troggle/tricky-troggle.jpg">
 <h3>Troggle Administration Utilities</h3>
 <ul>
+<li><a href="/newcave/">New Cave - directly into Cave Edit page
 <li><a href="/logreport/{{year}}">Delete logbook entry</a> -Online logbook suffers duplicate entries <span style="color:red">{{error}}</span>
 <li><a href="/survexfilewild/{{current_year}}">Un-walleted "wild" Survex({{current_year}})</a> -Survex files which are NOT linked to a wallet
 <li><a href="/pathsreport">Folder paths used</a> -folders settings used by this troggle installation