Remove base form content from other views

src/registrar/templates/application_contact.html

@@ -2,7 +2,11 @@
 {% extends 'application_form.html' %}
 {% load widget_tweaks %}
 
-{% block title %}Apply for a .gov domain - Your organization's contact information{% endblock %}
+{% block backnav %}
+  {% with form_name="step__org-contact" %}
+    {{ block.super }}
+  {% endwith %}
+{% endblock %}
 
 {% block form_content %}
 <h1>Your organization's contact information</h1>
@@ -14,7 +18,7 @@ of a larger entity. If so, enter information about your part of the larger entit
 
 <p>All fields are required unless they are marked optional.</p>
 
-<form class="usa-form usa-form--large" method="post">
+<form id="step__org-contact" class="usa-form usa-form--large" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}
 
@@ -26,10 +30,8 @@ of a larger entity. If so, enter information about your part of the larger entit
     {{ wizard.form.street_address|add_class:"usa-input" }}
   </fieldset>
 
-  {% if wizard.steps.prev %}
+  {{ block.super }}
-    <button name="wizard_goto_step" type="submit" class="usa-button usa-button--base" value="{{ wizard.steps.prev }}">Previous</button>
+  
-  {% endif %}
-  <button type="submit" class="usa-button">Submit</button>
 </form>
 
 {% endblock %}

src/registrar/templates/application_organization.html

@@ -3,12 +3,16 @@
 {% load widget_tweaks %}
 {% load dynamic_question_tags %}
 
-{% block title %}Apply for a .gov domain - About your organization{% endblock %}
+{% block backnav %}
+  {% with form_name="step__about-org" %}
+    {{ block.super }}
+  {% endwith %}
+{% endblock %}
 
 {% block form_content %}
 <h1>About your organization</h1>
 
-<form class="usa-form usa-form--large" method="post">
+<form id="step__about-org" class="usa-form usa-form--large" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}
 
@@ -48,7 +52,7 @@
     {{ wizard.form.is_election_board|add_class:"usa-radio" }}
   </fieldset>
 
-  <button type="submit" class="usa-button">Next</button>
+  {{ block.super }}  
 
 </form>
 {% endblock %}