--- a/app/soc/templates/soc/student_proposal/public.html	Tue Mar 17 17:19:30 2009 +0000
+++ b/app/soc/templates/soc/student_proposal/public.html	Tue Mar 17 17:35:12 2009 +0000
@@ -23,6 +23,20 @@
 {% endblock %}
 
 {% block body %}
+<table>
+   {% if is_subscribed %}
+   <td>
+     <input style="font-weight: bold" type="button" value="Unsubscribe from updates"
+       onclick="location.href='?subscription=off'"/>
+   </td>
+   {% else %}
+   <td>
+     <input style="font-weight: bold" type="button" value="Subscribe to updates"
+       onclick="location.href='?subscription=on'"/>
+   </td>
+   {% endif %}
+</table>
+
 <p>
  <table>
   {% readonly_field_as_table_row entity.fields.title.label entity.title %}
@@ -34,13 +48,7 @@
  </table>
 </p>
 
-<hr/>
-<b>Public Reviews</b>
-{% for review in public_reviews %}
-  {% as_student_proposal_review review student %}
-{% endfor %}
-<hr/>
-
+<hr />
 <form method="POST">
   <table>
     {% block form_table %}
@@ -55,19 +63,15 @@
    <td> 
     <input style="font-weight: bold" type="submit" value="Submit"/></span>
    </td>
-   {% if is_subscribed %}
-   <td>
-     <input style="font-weight: bold" type="button" value="Unsubscribe from updates"
-       onclick="location.href='?subscription=off'"/>
-   </td>
-   {% else %}
-   <td>
-     <input style="font-weight: bold" type="button" value="Subscribe to updates"
-       onclick="location.href='?subscription=on'"/>
-   </td>
-   {% endif %}
   </tr>
  </table>
 </form>
 
+<hr />
+<b>Public Reviews</b>
+{% for review in public_reviews %}
+  {% as_student_proposal_review review student %}
+{% endfor %}
+<hr />
+
 {% endblock %}

--- a/app/soc/templates/soc/student_proposal/review.html	Tue Mar 17 17:19:30 2009 +0000
+++ b/app/soc/templates/soc/student_proposal/review.html	Tue Mar 17 17:35:12 2009 +0000
@@ -20,6 +20,31 @@
 {% endblock %}
 
 {% block body %}
+<table>
+ {% if is_subscribed_public %}
+ <td>
+   <input style="font-weight: bold" type="button" value="Unsubscribe from public updates"
+     onclick="location.href='?public_subscription=off'"/>
+ </td>
+ {% else %}
+ <td>
+   <input style="font-weight: bold" type="button" value="Subscribe to public updates"
+     onclick="location.href='?public_subscription=on'"/>
+ </td>
+ {% endif %}
+ {% if is_subscribed_private %}
+ <td>
+   <input style="font-weight: bold" type="button" value="Unsubscribe from private updates"
+     onclick="location.href='?private_subscription=off'"/>
+ </td>
+ {% else %}
+ <td>
+   <input style="font-weight: bold" type="button" value="Subscribe to private updates"
+     onclick="location.href='?private_subscription=on'"/>
+ </td>
+ {% endif %}
+</table>
+
 <p>
  <table>
   {% readonly_field_as_table_row entity.fields.title.label entity.title %}
@@ -32,18 +57,8 @@
   {% readonly_field_as_table_row "Last Modified on" entity.last_modified_on %}
  </table>
 </p>
-<hr/>
-<b>Public Reviews</b>
-{% for review in public_reviews %}
-  {% as_student_proposal_review review student %}
-{% endfor %}
-<hr/>
-<b>Private Reviews</b>
-{% for review in private_reviews %}
-  {% as_student_proposal_review review student %}
-{% endfor %}
-<hr/>
 
+<hr />
 <form method="POST">
   <table>
     {% block form_table %}
@@ -77,29 +92,19 @@
        onclick="location.href='?ineligible=1'"/>
      </td>
    {% endif %}
-   {% if is_subscribed_public %}
-   <td>
-     <input style="font-weight: bold" type="button" value="Unsubscribe from public updates"
-       onclick="location.href='?public_subscription=off'"/>
-   </td>
-   {% else %}
-   <td>
-     <input style="font-weight: bold" type="button" value="Subscribe to public updates"
-       onclick="location.href='?public_subscription=on'"/>
-   </td>
-   {% endif %}
-   {% if is_subscribed_private %}
-   <td>
-     <input style="font-weight: bold" type="button" value="Unsubscribe from private updates"
-       onclick="location.href='?private_subscription=off'"/>
-   </td>
-   {% else %}
-   <td>
-     <input style="font-weight: bold" type="button" value="Subscribe to private updates"
-       onclick="location.href='?private_subscription=on'"/>
-   </td>
-   {% endif %}
  </table>
 </form>
 
+<hr />
+<b>Public Reviews</b>
+{% for review in public_reviews %}
+  {% as_student_proposal_review review student %}
+{% endfor %}
+<hr />
+<b>Private Reviews</b>
+{% for review in private_reviews %}
+  {% as_student_proposal_review review student %}
+{% endfor %}
+<hr />
+
 {% endblock %}