Index: WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml	(revision 2316)
+++ WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml	(revision 2322)
@@ -95,10 +95,10 @@
   </widget>
   <widget name="firstname" meta_type="String Widget">
-    <property name="title">Firstname</property>
+    <property name="title">First Name</property>
     <property name="fields">
       <element value="firstname"/>
     </property>
-    <property name="label">Firstname</property>
-    <property name="label_edit">Firstname</property>
+    <property name="label">First Name</property>
+    <property name="label_edit">First Name</property>
     <property name="description"></property>
     <property name="help"></property>
@@ -274,10 +274,10 @@
   </widget>
   <widget name="lastname" meta_type="String Widget">
-    <property name="title">Name</property>
+    <property name="title">Surname</property>
     <property name="fields">
       <element value="lastname"/>
     </property>
-    <property name="label">Name</property>
-    <property name="label_edit">Name</property>
+    <property name="label">Surname</property>
+    <property name="label_edit">Surname</property>
     <property name="description"></property>
     <property name="help"></property>
@@ -309,10 +309,10 @@
   </widget>
   <widget name="middlenames" meta_type="String Widget">
-    <property name="title">Middlenames</property>
+    <property name="title">Middle Names</property>
     <property name="fields">
       <element value="middlenames"/>
     </property>
-    <property name="label">Middlenames</property>
-    <property name="label_edit">Middlenames</property>
+    <property name="label">Middle Names</property>
+    <property name="label_edit">Middle Names</property>
     <property name="description"></property>
     <property name="help"></property>
@@ -426,5 +426,5 @@
     <property name="css_class_expr">string:row</property>
   </widget>
-  <widget name="screening_type" meta_type="String Widget">
+  <widget name="screening_type" meta_type="Select Widget">
     <property name="title">Screening Type</property>
     <property name="fields">
@@ -441,4 +441,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="css_class_expr">string:row</property>
+    <property name="vocabulary">screening_types</property>
   </widget>
   <widget name="reg_no" meta_type="JambRegNo Widget">
@@ -619,9 +620,15 @@
   </row>
   <row>
+   <cell name="firstname" ncols="2"/>
+  </row>
+  <row>
+   <cell name="middlenames" ncols="2"/>
+  </row>  
+  <row>
    <cell name="lastname" ncols="2"/>
   </row>
   <row>
    <cell name="date_of_birth" ncols="2"/>
-  </row>  
+  </row>
   <row>
    <cell name="email" ncols="2"/>
@@ -667,4 +674,7 @@
   </row>
   <row>
+   <cell name="screening_type" ncols="2"/>
+  </row>
+  <row>
    <cell name="passport" ncols="2"/>
   </row>
Index: WAeUP_SRP/fceokene/profiles/default/layouts/application_pce.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/layouts/application_pce.xml	(revision 2316)
+++ WAeUP_SRP/fceokene/profiles/default/layouts/application_pce.xml	(revision 2322)
@@ -426,5 +426,5 @@
     <property name="css_class_expr">string:row</property>
   </widget>
-  <widget name="screening_type" meta_type="String Widget">
+  <widget name="screening_type" meta_type="Select Widget">
     <property name="title">Screening Type</property>
     <property name="fields">
@@ -441,4 +441,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="css_class_expr">string:row</property>
+    <property name="vocabulary">screening_types</property>
   </widget>
   <widget name="reg_no" meta_type="JambRegNo Widget">
Index: WAeUP_SRP/fceokene/profiles/default/layouts/application_prence.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/layouts/application_prence.xml	(revision 2316)
+++ WAeUP_SRP/fceokene/profiles/default/layouts/application_prence.xml	(revision 2322)
@@ -25,4 +25,5 @@
     <property name="hidden_layout_modes">
       <element value="create"/>
+      <element value="edit"/>
     </property>
     <property name="hidden_readonly_layout_modes"/>
@@ -121,10 +122,10 @@
   </widget>
   <widget name="firstname" meta_type="String Widget">
-    <property name="title">Firstname</property>
+    <property name="title">First Name</property>
     <property name="fields">
       <element value="firstname"/>
     </property>
-    <property name="label">Firstname</property>
-    <property name="label_edit">Firstname</property>
+    <property name="label">First Name</property>
+    <property name="label_edit">First Name</property>
     <property name="description"></property>
     <property name="help"></property>
@@ -300,10 +301,10 @@
   </widget>
   <widget name="lastname" meta_type="String Widget">
-    <property name="title">Name</property>
+    <property name="title">Surname</property>
     <property name="fields">
       <element value="lastname"/>
     </property>
-    <property name="label">Name</property>
-    <property name="label_edit">Name</property>
+    <property name="label">Surname</property>
+    <property name="label_edit">Surname</property>
     <property name="description"></property>
     <property name="help"></property>
@@ -335,10 +336,10 @@
   </widget>
   <widget name="middlenames" meta_type="String Widget">
-    <property name="title">Middlenames</property>
+    <property name="title">Middle Names</property>
     <property name="fields">
       <element value="middlenames"/>
     </property>
-    <property name="label">Middlenames</property>
-    <property name="label_edit">Middlenames</property>
+    <property name="label">Middle Names</property>
+    <property name="label_edit">Middle Names</property>
     <property name="description"></property>
     <property name="help"></property>
@@ -452,5 +453,5 @@
     <property name="css_class_expr">string:row</property>
   </widget>
-  <widget name="screening_type" meta_type="String Widget">
+  <widget name="screening_type" meta_type="Select Widget">
     <property name="title">Screening Type</property>
     <property name="fields">
@@ -467,4 +468,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="css_class_expr">string:row</property>
+    <property name="vocabulary">screening_types</property>
   </widget>
   <widget name="score" meta_type="Int Widget">
@@ -628,4 +630,10 @@
   </row>
   <row>
+   <cell name="firstname" ncols="2"/>
+  </row>
+  <row>
+   <cell name="middlenames" ncols="2"/>
+  </row>  
+  <row>
    <cell name="lastname" ncols="2"/>
   </row>
Index: WAeUP_SRP/fceokene/profiles/default/layouts/application_pume.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/layouts/application_pume.xml	(revision 2316)
+++ WAeUP_SRP/fceokene/profiles/default/layouts/application_pume.xml	(revision 2322)
@@ -25,5 +25,5 @@
     </property>
     <property name="view_format">%d/%m/%Y</property>
-    <property name="time_setting">False</property>    
+    <property name="time_setting">False</property>
     <property name="hidden_readonly_layout_modes"/>
     <property name="css_class_expr">string:row</property>
@@ -428,5 +428,5 @@
     <property name="css_class_expr">string:row</property>
   </widget>
-  <widget name="screening_type" meta_type="String Widget">
+  <widget name="screening_type" meta_type="Select Widget">
     <property name="title">Screening Type</property>
     <property name="fields">
@@ -443,4 +443,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="css_class_expr">string:row</property>
+    <property name="vocabulary">screening_types</property>
   </widget>
   <widget name="reg_no" meta_type="JambRegNo Widget">
