diff --git a/layerindex/editlayer.html b/layerindex/editlayer.html
index 13178b0..54cfe0d 100644
--- a/layerindex/editlayer.html
+++ b/layerindex/editlayer.html
@@ -30,14 +30,14 @@
         </div>
         {% endblock %}
 
-{% block formtag %}
+{% block formtop %}
 {% if form.was_saved %}
     <div class="alert alert-success">
         Changes saved successfully.
     </div>
 {% endif %}
-<form id="edit_layer_form" action="{% url edit_layer form.instance.name %}" method="post">
 {% endblock %}
+<form id="edit_layer_form" method="post">
 {% csrf_token %}
     {% for hidden in form.hidden_fields %}
         {{ hidden }}
@@ -235,6 +235,10 @@
         $('#addanothermaintainer').click(expand_maintainer)
 
         $('#id_vcs_url').change(auto_web_fields)
+
+        firstfield = $("#edit_layer_form input:text, #edit_layer_form textarea").first();
+        if( ! firstfield.val() )
+            firstfield.focus()
     });
 </script>
 {% endblock %}
diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css
index d5abfe8..5d36df4 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -72,6 +72,10 @@ padding: 8px;
     margin: 0px;
 }
 
+.submitformintro {
+    padding-bottom: 0.75em;
+}
+
 .formfields input {
     width: 50%;
 }
diff --git a/layerindex/submitlayer.html b/layerindex/submitlayer.html
index 6950da9..41b5aa1 100644
--- a/layerindex/submitlayer.html
+++ b/layerindex/submitlayer.html
@@ -21,8 +21,10 @@
         {% endblock %}
 
 
-{% block formtag %}
-<form id="edit_layer_form" action="{% url submit_layer %}" method="post">
+{% block formtop %}
+<div class="submitformintro">
+    <p>Please enter the details for the layer you wish to add to the index.</p>
+</div>
 {% endblock %}
 
 {% block submitbuttons %}