diff --git a/core/forms.py b/core/forms.py
index 5a91afc..742e5bc 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -37,7 +37,7 @@ https://www.codeunderscored.com/model-formsets-in-django/
 https://django-formset.fly.dev/styling/
 """
 
-todo = """
+todo = """ - Finish rewriting NewProspectForm to include all validation in the form class itself.
 """
 
 
diff --git a/templates/new_prospect.html b/templates/new_prospect.html
index dcd6e7b..126f52e 100644
--- a/templates/new_prospect.html
+++ b/templates/new_prospect.html
@@ -20,7 +20,7 @@ New Cave and Entrance
     margin-left: 15%;
     font-family: monospace;
     font-weight: bold;
-    font-size: 150%;
+    font-size: 110%;
     text-align: right;
 }
 .prospect-form label {
@@ -54,38 +54,23 @@ New Cave and Entrance
   <form method="post" class="prospect-form">
     {% csrf_token %}
     {% for field in form %}
-      {% if field.name != 'discoverers' and field.name != 'identified_login' and field.name != 'who_are_you' %}
       <div>
         <label for="{{ field.id_for_label }}">{{ field.label }}</label>
         {{ field }}
         {% if field.help_text %}<small>{{ field.help_text }}</small>{% endif %}
         {% for error in field.errors %}<span class="error">{{ error }}</span>{% endfor %}
       </div>
-      {% endif %}
     {% endfor %}
-    <div>
-      <label for="{{ form.discoverers.id_for_label }}">{{ form.discoverers.label }}</label>
-      {{ form.discoverers }}
-      {% if form.discoverers.help_text %}<small>{{ form.discoverers.help_text }}</small>{% endif %}
-      {% for error in form.discoverers.errors %}<span class="error">{{ error }}</span>{% endfor %}
-    </div>
-    <div>
-      <label for="{{ form.identified_login.id_for_label }}">{{ form.identified_login.label }}</label>
-      {{ form.identified_login }}
-      {% if form.identified_login.help_text %}<small>{{ form.identified_login.help_text }}</small>{% endif %}
-      {% for error in form.identified_login.errors %}<span class="error">{{ error }}</span>{% endfor %}
-    </div>
-    <div>
-      <label for="{{ form.who_are_you.id_for_label }}">{{ form.who_are_you.label }}</label>
-      {{ form.who_are_you }}
-      {% if form.who_are_you.help_text %}<small>{{ form.who_are_you.help_text }}</small>{% endif %}
-      {% for error in form.who_are_you.errors %}<span class="error">{{ error }}</span>{% endfor %}
-    </div>
+
     <br>
     <button class="fancybutton" style="padding: 0.5em 25px; margin-left: 155px; font-size: 90%;" type="submit">Submit</button>
   </form>
 </div>
 {% if success %}
-  <div class="success-message">Prospect submitted successfully. You can edit the details below or enter another.</div>
+  <div class="success-message">New prospect data entered successfully. 
+    You can edit it here or enter data for another new prospect.<br />
+To add more information for this cave, e.g. a relevant survex file, or a second entrance,
+use the <a href=
+"/{{ form.area_code.value }}/{{ form.identifier.value }}/{{ form.area_code.value }}-{{ form.identifier.value }}_cave_edit/">Cave Edit form</a>.</div>
 {% endif %}
 {% endblock %}