diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html
index 219d107daa99d2450445f68f5d5ee7d73c0827d1..1d4f894f3ae07fd1d37d527496545380cf70a9bf 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_edit.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html
@@ -3,20 +3,19 @@
 {% load bootstrap %}
 
 {% block head_title %}Editing {{ proposal.title }}{% endblock %}
+{% block page_title %}Edit: {{ proposal.title }}{% endblock %}
 
-{% block body %}
-    <h1>Edit: {{ proposal.title }}</h1>
+{% block proposals_body %}
+  <p><a href="{% url "proposal_speaker_manage" proposal.pk %}">Manage speakers</a></p>
 
-    <p><a href="{% url "proposal_speaker_manage" proposal.pk %}">Manage speakers</a></p>
-
-    <form method="POST" action="" enctype="multipart/form-data">
-        {% csrf_token %}
-        <fieldset>
-            {{ form|bootstrap }}
-        </fieldset>
-        <div class="form-actions">
-            <input class="btn btn-primary" type="submit" value="Save" />
-            <a class="btn btn-default" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
-        </div>
-    </form>
+  <form method="POST" action="" enctype="multipart/form-data">
+      {% csrf_token %}
+      <fieldset>
+        {% include "_form_snippet.html" with form=form %}
+      </fieldset>
+      <div class="form-actions">
+          <input class="btn btn-primary" type="submit" value="Save" />
+          <a class="btn btn-default" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
+      </div>
+  </form>
 {% endblock %}