Index: /WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt	(revision 865)
+++ /WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt	(revision 866)
@@ -56,12 +56,7 @@
 
      
-      <form action="." method="post" class="group"
-            >
-        <table width="100%" cellspacing="0" cellpadding="2"
-               class="folderButtons">
-          <tr>
-            <td align="left" valign="top" rowspan="3"></td>
-            <td align="left" valign="top">
-                <input type="submit" name="raise_objection:method" value="Raise an Objection"
+      <form action="." method="post" class="group">
+
+                <input  tal:condition="python:review_state!='objection_raised'" type="submit" name="raise_objection:method" value="Raise an Objection"
                        class="destructive"
                        tal:attributes="onclick python:'return window.confirm(\'%s\')' %
@@ -71,7 +66,4 @@
                        class="context" value="Continue" 
                        />
-            </td>
-          </tr>
-        </table>
        </form>
     </span>
Index: /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 865)
+++ /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 866)
@@ -68,5 +68,11 @@
   
   <span tal:condition="python:path('info/review_state')=='objection_raised'">
-  <tr><td class="stopped">Objection raised</td></tr>
+  <tr>
+    <td class="stopped">
+    <a href="" tal:attributes="href string:${info/url}/admission_form">
+    Objection raised
+    </a>
+    </td>
+  </tr>
   </span>
   <span tal:condition="python:path('info/review_state')!='objection_raised'">
