Index: /WAeUP_SRP/trunk/skins/waeup_student/personal_edit_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/personal_edit_form.pt	(revision 1275)
+++ /WAeUP_SRP/trunk/skins/waeup_student/personal_edit_form.pt	(revision 1276)
@@ -1,19 +1,5 @@
-<metal:html tal:define="info context/getPersonalInfo">
-  <span tal:condition="not: info">
-    <span tal:content="here/illegal_view" />
-  </span>
-<metal:block tal:condition="info"> 
-<metal:block tal:define="rendered_main python:info['per_doc'].render(
-                      layout_mode='edit',
-                      schema_id = 'student_personal',
-                      layout_id = 'student_personal_fe',
-                      request=request, 
-                      use_session=True,);
-           form_action string:personal_edit;
-           edition python:True;
-           metadata nothing;
-            ">
-  <metal:body use-macro="here/waeup_content_master/macros/master">
-    <metal:block fill-slot="header">
+<metal:body use-macro="here/waeup_content_master/macros/master">
+    <metal:block fill-slot="header"
+                  tal:define="info context/getPersonalInfo">
       <a href=""
          tal:attributes="href string:${here/academicsParent}">
@@ -25,5 +11,16 @@
     </metal:block>  
   
-    <metal:main fill-slot="main">
+    <metal:main fill-slot="main"
+                  tal:define="info context/getPersonalInfo;
+                              rendered_main python:info['per_doc'].render(
+                              layout_mode='edit',
+                              schema_id = 'student_personal',
+                              layout_id = 'student_personal_fe',
+                              request=request, 
+                              use_session=True,);
+           form_action string:personal_edit;
+           edition python:True;
+           metadata nothing;
+            ">
     <form action="ACTION" method="post" id="editForm"
           enctype="multipart/form-data" class="workflow"
@@ -41,6 +38,4 @@
     </form>
     </metal:main>
-  </metal:body>
-</metal:block>
-</metal:block>
-</metal:html>
+</metal:body>
+
