Index: /WAeUP_SRP/trunk/profiles/default/layouts.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 456)
@@ -21,4 +21,5 @@
  <object name="student_course_results" meta_type="CPS Layout"/>
  <object name="student_personal" meta_type="CPS Layout"/>
+ <object name="student_personal_fe" meta_type="CPS Layout"/>
  <object name="student_password" meta_type="CPS Layout"/>
  <object name="student_schoolresults" meta_type="CPS Layout"/>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_admission.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_admission.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_admission.xml	(revision 456)
@@ -78,4 +78,16 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ 
+ <widget name="entry_mode" meta_type="String Widget">
+  <property name="title">Mode of Entry</property>
+  <property name="fields">
+   <element value="entry_mode"/>
+  </property>
+  <property name="label">Mode of Entry</property>
+  <property name="label_edit">Mode of Entry</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget> 
 
  <widget name="jamb_sex" meta_type="Boolean Widget">
@@ -242,6 +254,6 @@
    <element value="passport"/>
   </property>
-  <property name="label"></property>
-  <property name="label_edit"></property>
+  <property name="label">Passport Picture</property>
+  <property name="label_edit">Passport Picture</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_admission_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_admission_fe.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_admission_fe.xml	(revision 456)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="student_admission" meta_type="CPS Layout">
+<object name="student_admission_fe" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
  <property name="layout_edit_method"></property>
@@ -42,231 +42,4 @@
  </widget>
 
- <widget name="jamb_firstname" meta_type="String Widget">
-  <property name="title">JAMB First Name</property>
-  <property name="fields">
-   <element value="jamb_firstname"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">JAMB First Name</property>
-  <property name="label_edit">JAMB First Name</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_lastname" meta_type="String Widget">
-  <property name="title">JAMB Lastname</property>
-  <property name="fields">
-   <element value="jamb_lastname"/>
-  </property>
-  <property name="label">JAMB Lastname</property>
-  <property name="label_edit">JAMB Lastname</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_middlename" meta_type="String Widget">
-  <property name="title">JAMB Middle Name</property>
-  <property name="fields">
-   <element value="jamb_middlename"/>
-  </property>
-  <property name="label">JAMB Middl Name</property>
-  <property name="label_edit">JAMB Middle Name</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_sex" meta_type="Boolean Widget">
-  <property name="title">JAMB Sex</property>
-  <property name="fields">
-   <element value="jamb_sex"/>
-  </property>
-  <property name="label">JAMB Sex</property>
-  <property name="label_edit">JAMB Sex</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">male</property>
-  <property name="label_true">female</property>
- </widget>
-
- <widget name="jamb_age" meta_type="Int Widget">
-  <property name="title">JAMB Age</property>
-  <property name="fields">
-   <element value="jamb_age"/>
-  </property>
-  <property name="label">JAMB Age</property>
-  <property name="label_edit">JAMB Age</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_state" meta_type="String Widget">
-  <property name="title">JAMB State</property>
-  <property name="fields">
-   <element value="jamb_state"/>
-  </property>
-  <property name="label">JAMB State</property>
-  <property name="label_edit">JAMB State</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_lga" meta_type="String Widget">
-  <property name="title">JAMB Local Government Area</property>
-  <property name="fields">
-   <element value="jamb_lga"/>
-  </property>
-  <property name="label">JAMB Local Government Area</property>
-  <property name="label_edit">JAMB Local Government Area</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_score" meta_type="String Widget">
-  <property name="title">JAMB Score</property>
-  <property name="fields">
-   <element value="jamb_score"/>
-  </property>
-  <property name="label">JAMB Score</property>
-  <property name="label_edit">JAMB Score</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_first_cos" meta_type="String Widget">
-  <property name="title">JAMB First Choice Course of Study</property>
-  <property name="fields">
-   <element value="jamb_first_cos"/>
-  </property>
-  <property name="label">JAMB First Choice Course of Study</property>
-  <property name="label_edit">JAMB First Choice Course of Study</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_second_cos" meta_type="String Widget">
-  <property name="title">JAMB Second Choice Course of Study</property>
-  <property name="fields">
-   <element value="jamb_second_cos"/>
-  </property>
-  <property name="label">JAMB Second Choice Course of Study</property>
-  <property name="label_edit">JAMB Second Choice Course of Study</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_first_uni" meta_type="String Widget">
-  <property name="title">JAMB First Choice University</property>
-  <property name="fields">
-   <element value="jamb_first_uni"/>
-  </property>
-  <property name="label">JAMB First Choice University</property>
-  <property name="label_edit">JAMB First Choice University</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_second_uni" meta_type="String Widget">
-  <property name="title">JAMB Second Choice University</property>
-  <property name="fields">
-   <element value="jamb_second_uni"/>
-  </property>
-  <property name="label">JAMB Second Choice University</property>
-  <property name="label_edit">JAMB Second Choice University</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_gen_paper" meta_type="String Widget">
-  <property name="title">PUME General Paper</property>
-  <property name="fields">
-   <element value="pume_gen_paper"/>
-  </property>
-  <property name="label">PUME General Paper</property>
-  <property name="label_edit">PUME General Paper</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_eng_score" meta_type="String Widget">
-  <property name="title">PUME English Score</property>
-  <property name="fields">
-   <element value="pume_eng_score"/>
-  </property>
-  <property name="label">PUME English Score</property>
-  <property name="label_edit">PUME English Score</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_math_score" meta_type="String Widget">
-  <property name="title">PUME Mathematics Score</property>
-  <property name="fields">
-   <element value="pume_math_score"/>
-  </property>
-  <property name="label">PUME Mathematics Score</property>
-  <property name="label_edit">PUME Mathematics Score</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_tot_score" meta_type="String Widget">
-  <property name="title">PUME Total Score</property>
-  <property name="fields">
-   <element value="pume_tot_score"/>
-  </property>
-  <property name="label">PUME Total Score</property>
-  <property name="label_edit">PUME Total Score</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
  <widget name="passport" meta_type="Image Widget">
   <property name="title">Passport Picture</property>
@@ -274,6 +47,6 @@
    <element value="passport"/>
   </property>
-  <property name="label"></property>
-  <property name="label_edit"></property>
+  <property name="label">Passport Picture</property>
+  <property name="label_edit">Passport Picture</property>
     <property name="readonly_layout_modes">
    <element value=""/>
@@ -296,52 +69,4 @@
   </row>
   <row>
-   <cell name="jamb_firstname"/>
-  </row>
-  <row>
-   <cell name="jamb_middlename"/>
-  </row>
-  <row>
-   <cell name="jamb_lastname"/>
-  </row>
-  <row>
-   <cell name="jamb_sex"/>
-  </row>
-  <row>
-   <cell name="jamb_age"/>
-  </row>
-  <row>
-   <cell name="jamb_state"/>
-  </row>
-  <row>
-   <cell name="jamb_lga"/>
-  </row>
-  <row>
-   <cell name="jamb_score"/>
-  </row>
-  <row>
-   <cell name="jamb_first_cos"/>
-  </row>
-  <row>
-   <cell name="jamb_second_cos"/>
-  </row>
-  <row>
-   <cell name="jamb_first_uni"/>
-  </row>
-  <row>
-   <cell name="jamb_second_uni"/>
-  </row>
-  <row>
-   <cell name="pume_gen_paper"/>
-  </row>
-  <row>
-   <cell name="pume_eng_score"/>
-  </row>
-  <row>
-   <cell name="pume_math_score"/>
-  </row>
-  <row>
-   <cell name="pume_tot_score"/>
-  </row>
-  <row>
    <cell name="passport"/>
   </row>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml	(revision 456)
@@ -761,7 +761,4 @@
  <table>
   <row>
-   <cell name="jamb_reg_no"/>
-  </row>
-  <row>
    <cell name="matric_no"/>
   </row>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml	(revision 456)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="student_clearance" meta_type="CPS Layout">
+<object name="student_clearance_fe" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
  <property name="layout_edit_method"></property>
@@ -7,79 +7,4 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
-
- <widget name="clr_ac_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Clearance PIN</property>
-  <property name="fields">
-   <element value="clr_ac_pin"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Clearance PIN</property>
-  <property name="label_edit">Clearance PIN</property>
-  <property
-     name="help"></property>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes">
-   <element value="create"/>
-  </property>
-  <property name="size_max">12</property>
- </widget>
-
- <widget name="matric_no" meta_type="String Widget">
-  <property name="title">Matriculation Number</property>
-  <property name="fields">
-   <element value="matric_no"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Matriculation Number</property>
-  <property name="label_edit">Matriculation Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="display_width">10</property>
-  <property name="size_max">10</property>
- </widget>
-
- <widget name="entry_date" meta_type="Date Widget">
-  <property name="title">Entry Date</property>
-  <property name="fields">
-   <element value="entry_date"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Entry Date</property>
-  <property name="label_edit">Entry Date</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="entry_session" meta_type="String Widget">
-  <property name="title">Entry Session</property>
-  <property name="fields">
-   <element value="entry_session"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Entry Session</property>
-  <property name="label_edit">Entry Session</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="birthday" meta_type="Date Widget">
-  <property name="title">Day of Birth</property>
-  <property name="fields">
-   <element value="birthday"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Day of Birth</property>
-  <property name="label_edit">Day of Birth</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
 
 
@@ -114,670 +39,6 @@
 
 
- <widget name="email" meta_type="Email Widget">
-  <property name="title">Email</property>
-  <property name="fields">
-   <element value="email"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Email</property>
-  <property name="label_edit">Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-  <widget name="fst_sit_fname" meta_type="String Widget">
-  <property name="title">Fullname</property>
-  <property name="fields">
-   <element value="fst_sit_fname"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Fullname</property>
-  <property name="label_edit">Fullname</property>
-  <property
-     name="help">Fullname as it appears on certificate/result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="fst_sit_no" meta_type="String Widget">
-  <property name="title">Exam Number</property>
-  <property name="fields">
-   <element value="fst_sit_no"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Number</property>
-  <property name="label_edit">Exam Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="fst_sit_date" meta_type="Date Widget">
-  <property name="title">Exam Date</property>
-  <property name="fields">
-   <element value="fst_sit_date"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Date</property>
-  <property name="label_edit">Exam Date</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="fst_sit_type" meta_type="Select Widget">
-  <property name="title">Exam Type</property>
-  <property name="fields">
-   <element value="fst_sit_type"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Type</property>
-  <property name="label_edit">Exam Type</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">exam_types</property>
- </widget>
-
- <widget name="fst_sit_scan" meta_type="Image Widget">
-  <property name="title">Scan of First Sitting Result</property>
-  <property name="fields">
-   <element value="fst_sit_scan"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Scan of First Sitting Result</property>
-  <property name="label_edit">Scan of First Sitting Result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
-
-  <widget name="scd_sit_fname" meta_type="String Widget">
-  <property name="title">Fullname</property>
-  <property name="fields">
-   <element value="scd_sit_fname"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Fullname</property>
-  <property name="label_edit">Fullname</property>
-  <property
-     name="help">Fullname as it appears on certificate/result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="scd_sit_no" meta_type="String Widget">
-  <property name="title">Exam Number</property>
-  <property name="fields">
-   <element value="scd_sit_no"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Number</property>
-  <property name="label_edit">Exam Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="scd_sit_date" meta_type="Date Widget">
-  <property name="title">Exam Date</property>
-  <property name="fields">
-   <element value="scd_sit_date"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Date</property>
-  <property name="label_edit">Exam Date</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="scd_sit_type" meta_type="Select Widget">
-  <property name="title">Exam Type</property>
-  <property name="fields">
-   <element value="scd_sit_type"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Type</property>
-  <property name="label_edit">Exam Type</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">exam_types</property>
- </widget>
-
- <widget name="scd_sit_scan" meta_type="Image Widget">
-  <property name="title">Scan of Second Sitting Result</property>
-  <property name="fields">
-   <element value="scd_sit_scan"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Scan of Second Sitting Result</property>
-  <property name="label_edit">Scan of Second Sitting Result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="alr_fname" meta_type="String Widget">
-  <property name="title">Fullname</property>
-  <property name="fields">
-   <element value="alr_fname"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Fullname</property>
-  <property name="label_edit">Fullname</property>
-  <property
-     name="help">Fullname as it appears on certificate/result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="alr_no" meta_type="String Widget">
-  <property name="title">Exam Number</property>
-  <property name="fields">
-   <element value="alr_no"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Number</property>
-  <property name="label_edit">Exam Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="alr_date" meta_type="Date Widget">
-  <property name="title">Exam Date</property>
-  <property name="fields">
-   <element value="alr_date"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Exam Date</property>
-  <property name="label_edit">Exam Date</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="alr_scan" meta_type="Image Widget">
-  <property name="title">Scan of Advanced Level Result</property>
-  <property name="fields">
-   <element value="alr_scan"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Scan of Advanced Level Result</property>
-  <property name="label_edit">Scan of Advanced Level Result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="hq_type" meta_type="Select Widget">
-  <property name="title">Higher Qualification</property>
-  <property name="fields">
-   <element value="hq_type"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Higher Qualification</property>
-  <property name="label_edit">Higher Qualification</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">high_qual</property>
- </widget>
-
- <widget name="hq_grade" meta_type="Select Widget">
-  <property name="title">Higher Qualification Grade</property>
-  <property name="fields">
-   <element value="hq_grade"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Higher Qualification Grade</property>
-  <property name="label_edit">Higher Qualification Grade</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">high_grade</property>
- </widget>
-
- <widget name="hq_school" meta_type="String Widget">
-  <property name="title">School Attended</property>
-  <property name="fields">
-   <element value="hq_school"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">School Attended</property>
-  <property name="label_edit">School Attended</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hq_matric_no" meta_type="String Widget">
-  <property name="title">Matric Number</property>
-  <property name="fields">
-   <element value="hq_matric_no"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Matric Number</property>
-  <property name="label_edit">Matric Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hq_session" meta_type="String Widget">
-  <property name="title">Session Obtained</property>
-  <property name="fields">
-   <element value="hq_session"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Session Obtained</property>
-  <property name="label_edit">Session Obtained</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hq_disc" meta_type="String Widget">
-  <property name="title">Discipline</property>
-  <property name="fields">
-   <element value="hq_disc"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Discipline</property>
-  <property name="label_edit">Discipline</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hq_scan" meta_type="Image Widget">
-  <property name="title">Scan of Higher Qualification Result</property>
-  <property name="fields">
-   <element value="hq_scan"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Scan of Higher Qualification Result</property>
-  <property name="label_edit">Scan of Higher Qualification Result</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="birth_certificate" meta_type="Image Widget">
-  <property name="title">Birth Certificate</property>
-  <property name="fields">
-   <element value="birth_certificate"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Birth Certificate</property>
-  <property name="label_edit">Birth Certificate</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
-
- <widget name="lga_ident" meta_type="Image Widget">
-  <property name="title">LGA Identification</property>
-  <property name="fields">
-   <element value="lga_ident"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">LGA Identification</property>
-  <property name="label_edit">LGA Identification</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="acc_let" meta_type="Image Widget">
-  <property name="title">Acceptance Letter </property>
-  <property name="fields">
-   <element value="acc_let"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Acceptance Letter </property>
-  <property name="label_edit">Acceptance Letter </property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="jamb_slip" meta_type="Image Widget">
-  <property name="title">JAMB Slip</property>
-  <property name="fields">
-   <element value="jamb_slip"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">JAMB Slip</property>
-  <property name="label_edit">JAMB Slip</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="cert" meta_type="Image Widget">
-  <property name="title">Certificate</property>
-  <property name="fields">
-   <element value="cert"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Certificateficate</property>
-  <property name="label_edit">Certificateficate</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="evid" meta_type="Image Widget">
-  <property name="title">Evidence of Name</property>
-  <property name="fields">
-   <element value="evid"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Evidence of Name</property>
-  <property name="label_edit">Evidence of Name</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="passport" meta_type="Image Widget">
-  <property name="title">Passport</property>
-  <property name="fields">
-   <element value="passport"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Passport</property>
-  <property name="label_edit">Passport</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="jamb_let" meta_type="Image Widget">
-  <property name="title">JAMB Letter</property>
-  <property name="fields">
-   <element value="jamb_let"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">JAMB Letter</property>
-  <property name="label_edit">JAMB Letter</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="res_stat" meta_type="Image Widget">
-  <property name="title">Result Statement</property>
-  <property name="fields">
-   <element value="res_stat"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Result Statement</property>
-  <property name="label_edit">Result Statement</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="ref_let" meta_type="Image Widget">
-  <property name="title">Referee Letter</property>
-  <property name="fields">
-   <element value="ref_let"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Referee Letter</property>
-  <property name="label_edit">Referee Letter</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="cred" meta_type="Image Widget">
-  <property name="title">Credential</property>
-  <property name="fields">
-   <element value="cred"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Credential</property>
-  <property name="label_edit">Credential</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="stat_dec" meta_type="Image Widget">
-  <property name="title">Statutory Declaration of Good Conduct</property>
-  <property name="fields">
-   <element value="stat_dec"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Statutory Declaration of Good Conduct</property>
-  <property name="label_edit">Statutory Declaration of Good Conduct</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="age_dec" meta_type="Image Widget">
-  <property name="title">Age Declaration</property>
-  <property name="fields">
-   <element value="age_dec"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Age Declaration</property>
-  <property name="label_edit">Age Declaration</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="acc_inst" meta_type="Image Widget">
-  <property name="title">Accepted by Institution</property>
-  <property name="fields">
-   <element value="acc_inst"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Accepted by Institution</property>
-  <property name="label_edit">Accepted by Institution</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <widget name="fst_ch" meta_type="Boolean Widget">
-  <property name="title">First Choice</property>
-  <property name="fields">
-   <element value="fst_ch"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">First Choice</property>
-  <property name="label_edit">First Choice</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="scd_ch" meta_type="Boolean Widget">
-  <property name="title">Second Choice</property>
-  <property name="fields">
-   <element value="scd_ch"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Second Choice</property>
-  <property name="label_edit">Second Choice</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="sup_adm" meta_type="Boolean Widget">
-  <property name="title">Supplementary Addmission</property>
-  <property name="fields">
-   <element value="sup_adm"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Supplementary Addmission</property>
-  <property name="label_edit">Supplementary Addmission</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="uniben" meta_type="Boolean Widget">
-  <property name="title">Former UNIBEN Student</property>
-  <property name="fields">
-   <element value="uniben"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Former UNIBEN Student</property>
-  <property name="label_edit">Former UNIBEN Student</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="form_matric_no" meta_type="String Widget">
-  <property name="title">Former Matric/RegNo </property>
-  <property name="fields">
-   <element value="form_matric_no"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Former Matric/RegNo</property>
-  <property name="label_edit">Former Matric/RegNo</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="def_adm" meta_type="Boolean Widget">
-  <property name="title">Deferment of Admission</property>
-  <property name="fields">
-   <element value="def_adm"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Deferment of Admission</property>
-  <property name="label_edit">Deferment of Admission</property>
-  <property
-     name="help">Tick this box if you wish to defer admission till next session.</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="acknow" meta_type="Boolean Widget">
-  <property name="title">Acknowledgement</property>
-  <property name="fields">
-   <element value="acknow"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Acknowledgement</property>
-  <property name="label_edit">Acknowledgement</property>
-  <property
-     name="help">I hereby acknowledge by ticking this check box that if it is discovered at any time that i do not possess any of the qualifications which i claim to have obtained, i will be expelled from the University and shall not be re-admitted for the same or any other programme, even if i have upgraded my previous qualifications or possess additional qualifications.</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
 
  <table>
-  <row>
-   <cell name="jamb_reg_no"/>
-  </row>
-  <row>
-   <cell name="matric_no"/>
-  </row>
-  <row>
-   <cell name="clr_ac_pin"/>
-  </row>
-  <row>
-   <cell name="entry_date"/>
-  </row>
-  <row>
-   <cell name="entry_session"/>
-  </row>
-  <row>
-   <cell name="birthday"/>
-  </row>
   <row>
    <cell name="lga"/>
@@ -786,133 +47,4 @@
    <cell name="nationality"/>
   </row>
-  <row>
-   <cell name="email"/>
-  </row>
-  <row>
-   <cell name="fst_sit_fname"/>
-  </row>
-  <row>
-   <cell name="fst_sit_no"/>
-  </row>
-  <row>
-   <cell name="fst_sit_date"/>
-  </row>
-  <row>
-   <cell name="fst_sit_type"/>
-  </row>
-  <row>
-   <cell name="fst_sit_scan"/>
-  </row>
-  <row>
-   <cell name="scd_sit_fname"/>
-  </row>
-  <row>
-   <cell name="scd_sit_no"/>
-  </row>
-  <row>
-   <cell name="scd_sit_date"/>
-  </row>
-  <row>
-   <cell name="scd_sit_type"/>
-  </row>
-  <row>
-   <cell name="scd_sit_scan"/>
-  </row>
-  <row>
-   <cell name="alr_fname"/>
-  </row>
-  <row>
-   <cell name="alr_no"/>
-  </row>
-  <row>
-   <cell name="alr_date"/>
-  </row>
-  <row>
-   <cell name="alr_scan"/>
-  </row>
-  <row>
-   <cell name="hq_type"/>
-  </row>
-  <row>
-   <cell name="hq_grade"/>
-  </row>
-  <row>
-   <cell name="hq_school"/>
-  </row>
-  <row>
-   <cell name="hq_matric_no"/>
-  </row>
-  <row>
-   <cell name="hq_session"/>
-  </row>
-  <row>
-   <cell name="hq_disc"/>
-  </row>
-  <row>
-   <cell name="hq_scan"/>
-  </row>
-  <row>
-   <cell name="birth_certificate"/>
-  </row>
-  <row>
-   <cell name="lga_ident"/>
-  </row>
-  <row>
-   <cell name="acc_let"/>
-  </row>
-  <row>
-   <cell name="jamb_slip"/>
-  </row>
-  <row>
-   <cell name="cert"/>
-  </row>
-  <row>
-   <cell name="evid"/>
-  </row>
-  <row>
-   <cell name="passport"/>
-  </row>
-  <row>
-   <cell name="jamb_let"/>
-  </row>
-  <row>
-   <cell name="res_stat"/>
-  </row>
-  <row>
-   <cell name="ref_let"/>
-  </row>
-  <row>
-   <cell name="cred"/>
-  </row>
-  <row>
-   <cell name="stat_dec"/>
-  </row>
-  <row>
-   <cell name="age_dec"/>
-  </row>
-  <row>
-   <cell name="acc_inst"/>
-  </row>
-  <row>
-   <cell name="fst_ch"/>
-  </row>
-  <row>
-   <cell name="scd_ch"/>
-  </row>
-  <row>
-   <cell name="sup_adm"/>
-  </row>
-  <row>
-   <cell name="uniben"/>
-  </row>
-  <row>
-   <cell name="form_matric_no"/>
-  </row>
-  <row>
-   <cell name="def_adm"/>
-  </row>
-  <row>
-   <cell name="acknow"/>
-  </row>
  </table>
 
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 456)
@@ -9,11 +9,11 @@
 
  <widget name="firstname" meta_type="String Widget">
-  <property name="title">First Name</property>
+  <property name="title">Firstname</property>
   <property name="fields">
    <element value="firstname"/>
   </property>
   <property name="is_required">True</property>
-  <property name="label">First Name</property>
-  <property name="label_edit">First Name</property>
+  <property name="label">Firstname</property>
+  <property name="label_edit">Firstname</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -22,10 +22,10 @@
 
  <widget name="middlename" meta_type="String Widget">
-  <property name="title">Middle Name</property>
+  <property name="title">Middlename</property>
   <property name="fields">
    <element value="middlename"/>
   </property>
-  <property name="label">Middl Name</property>
-  <property name="label_edit">Middle Name</property>
+  <property name="label">Middlename</property>
+  <property name="label_edit">Middlename</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_personal_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_personal_fe.xml	(revision 456)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_personal_fe.xml	(revision 456)
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<object name="student_personal_fe" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_waeup_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+
+ <widget name="firstname" meta_type="String Widget">
+  <property name="title">Firstname</property>
+  <property name="fields">
+   <element value="firstname"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Firstname</property>
+  <property name="label_edit">Firstname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="middlename" meta_type="String Widget">
+  <property name="title">Middlename</property>
+  <property name="fields">
+   <element value="middlename"/>
+  </property>
+  <property name="label">Middlename</property>
+  <property name="label_edit">Middlename</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="lastname" meta_type="String Widget">
+  <property name="title">Lastname</property>
+  <property name="fields">
+   <element value="lastname"/>
+  </property>
+  <property name="label">Lastname</property>
+  <property name="label_edit">Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="sex" meta_type="Boolean Widget">
+  <property name="title">Sex</property>
+  <property name="fields">
+   <element value="sex"/>
+  </property>
+  <property name="label">Sex</property>
+  <property name="label_edit">Sex</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">male</property>
+  <property name="label_true">female</property>
+ </widget>
+
+
+ <table>
+  <row>
+   <cell name="firstname"/>
+  </row>
+  <row>
+   <cell name="middlename"/>
+  </row>
+  <row>
+   <cell name="lastname"/>
+  </row>
+  <row>
+   <cell name="sex"/>
+  </row>
+ </table>
+</object>
Index: /WAeUP_SRP/trunk/profiles/default/schemas/student_admission.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas/student_admission.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/schemas/student_admission.xml	(revision 456)
@@ -28,4 +28,6 @@
  <field name="jamb_first_uni" meta_type="CPS String Field"/>
  <field name="jamb_second_uni" meta_type="CPS String Field"/>
+ 
+ <field name="entry_mode" meta_type="CPS String Field"/>
 
  <field name="pume_gen_paper" meta_type="CPS String Field"/>
Index: /WAeUP_SRP/trunk/profiles/default/types/StudentAdmission.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentAdmission.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/types/StudentAdmission.xml	(revision 456)
@@ -23,5 +23,5 @@
  </property>
  <property name="layout_clusters">
-  <element value="front_end:student_admission_fe"/>
+  <element value="adm_slip:student_admission_fe"/>
  </property>
  <property name="flexible_layouts"/>
Index: /WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml	(revision 456)
@@ -23,5 +23,5 @@
  </property>
  <property name="layout_clusters">
-  <element value=""/>
+  <element value="adm_slip:student_clearance_fe"/>
  </property>
  <property name="flexible_layouts"/>
@@ -31,5 +31,5 @@
  <alias from="view" to="academics_contents"/>
  <action title="Standard View" action_id="view" category="object"
-    condition_expr="" 
+    condition_expr=""
     url_expr="string:${object_url}/academics_contents"
     visible="True">
@@ -37,5 +37,5 @@
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" 
+    condition_expr=""
     url_expr="string:${object_url}/cpsdocument_edit_form"
     visible="True">
Index: /WAeUP_SRP/trunk/profiles/default/types/StudentPersonal.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentPersonal.xml	(revision 455)
+++ /WAeUP_SRP/trunk/profiles/default/types/StudentPersonal.xml	(revision 456)
@@ -23,5 +23,5 @@
  </property>
  <property name="layout_clusters">
-  <element value=""/>
+  <element value="adm_slip:student_personal_fe"/>
  </property>
  <property name="flexible_layouts"/>
@@ -31,5 +31,5 @@
  <alias from="view" to="academics_contents"/>
  <action title="Standard View" action_id="view" category="object"
-    condition_expr="" 
+    condition_expr=""
     url_expr="string:${object_url}/academics_contents"
     visible="True">
Index: /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt	(revision 456)
+++ /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt	(revision 456)
@@ -0,0 +1,50 @@
+<html metal:use-macro="here/content_lib_master/macros/master">
+  <metal:block fill-slot="head_slot">
+  </metal:block>
+
+  <metal:block fill-slot="css_slot">
+    <link rel="Stylesheet" type="text/css" href=""
+      tal:attributes="href string:${base_url}document.css" />
+  </metal:block>
+  <metal:block fill-slot="header">
+  </metal:block>
+
+  <metal:block fill-slot="main"
+               tal:define="roles member/getRoles;
+               frontend python:'Student' in roles or isAnon;
+               folder here/getContent;"                              
+               >
+
+    <tal:block tal:condition="python:context.portal_type == 'Student'" tal:omit-tag="">  
+      <tal:block tal:define="
+                          adm python:here.admission;
+                          adm_proxy python:adm.getContent();
+                          clear python:here.clearance;
+                          clear_proxy python:clear.getContent();
+                          pers python:here.personal;
+                          pers_proxy python:pers.getContent();"
+                          >
+
+      <h2>Acknowledgement Slip for <span tal:content="pers_proxy/firstname" /> <span tal:content="pers_proxy/lastname" /></h2>      
+  
+   
+      <tal:block  tal:content="structure python:adm_proxy.render(cluster='adm_slip')" />
+      <tal:block  tal:content="structure python:clear_proxy.render(cluster='adm_slip')" /> 
+      <tal:block  tal:content="structure python:pers_proxy.render(cluster='adm_slip')" />
+
+
+      </tal:block>  
+    </tal:block>
+    <tal:block condition="python:context.portal_type != 'Student'">
+    
+      This is not a student object!
+    
+    </tal:block>  
+  
+  </metal:block>
+
+
+
+  <metal:block fill-slot="sub">
+  </metal:block>
+</html>
