diff -r 22f41aafcedc -r 4b8aa5b9cb23 app/soc/templates/soc/survey/take.html
--- a/app/soc/templates/soc/survey/take.html	Sun Aug 09 13:03:47 2009 -0700
+++ b/app/soc/templates/soc/survey/take.html	Sun Aug 09 13:42:31 2009 -0700
@@ -12,6 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 {% endcomment %}
+{% load forms_helpers %}
 
 {% block scripts %}
 {{ block.super }}
@@ -27,46 +28,50 @@
 {% block body %}
 <div id="created">Last modified on {{ entity.modified }} by {{ entity.modified_by.name }}</div>
 
-{% if survey_form %}
-
-  {% load forms_helpers %}
-
-  {{ help_text }}
+<div id="help_text">
+  {% block help_text %}
+    {{ help_text }}
+  {% endblock help_text %}
+</div>
 
-  {% if entity.content %}
-    <div id="survey_description">
-      {{ entity.content|safe }}
-    </div>
-  {% endif %}
+{% block survey_description %}
+{% if entity.content %}
+  <div id="survey_description">
+    {{ entity.content|safe }}
+  </div>
+{% endif %}
+{% endblock survey_description %}
 
-  {% if form_action %}
-    <form method="post" action="{{ form_action }}">
-  {% else %}
-    <form method="post">
-  {% endif %}
-    <div style="width:100%;">
-      <div class="{{ status }}" id="survey_widget">
-        <table>
-          {% block form_table %}
-            {% as_twoline_table survey_form %}
-          {% endblock %}
-        </table>
-      </div> {# end survey_widget #}
-    </div>
+{% block survey_form %}
+{% if form_action %}
+  <form method="post" action="{{ form_action }}">
+{% else %}
+  <form method="post">
+{% endif %}
+  <div style="width:100%;">
+    <div class="{{ status }}" id="survey_widget">
+      <table>
+        {% block form_table %}
+          {% as_twoline_table survey_form %}
+        {% endblock %}
+      </table>
+    </div> {# end survey_widget #}
+  </div>
 
-<br><br>
-    <div>
-      <table>
-        <tbody>
-          <tr>
-            <td>
-              <input type="submit" value="Submit" style="font-weight: bold;">
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  </form>
-{% endif %}
+  <br /><br />
 
-{% endblock %}
+  <div>
+    <table>
+      <tbody>
+        <tr>
+          <td>
+            <input type="submit" value="Submit" style="font-weight: bold;">
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</form>
+{% endblock survey_form %}
+
+{% endblock body %}