Index: WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml	(revision 656)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml	(revision 658)
@@ -17,4 +17,6 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">iso8601_medium_easy</property>
+<property name="hidden_empty">True</property>
  </widget>
  <widget name="acco_maint_sc_pin" meta_type="String Widget">
@@ -28,4 +30,5 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+<property name="hidden_empty">True</property>
  </widget>
  <widget name="acco_maint_sc_serial" meta_type="String Widget">
@@ -40,9 +43,10 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">10</property>
+<property name="hidden_empty">True</property>
  </widget>
  <widget name="acco_res_date" meta_type="DateTime Widget">
   <property name="title">Accommodation Reservation Date</property>
   <property name="fields">
-   <element value="acco_res-date"/>
+   <element value="acco_res_date"/>
   </property>
   <property name="label">Accommodation Reservation Date</property>
@@ -51,12 +55,13 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">iso8601_medium_easy</property>
  </widget>
  <widget name="acco_res_sc_pin" meta_type="String Widget">
-  <property name="title">Accommodation Reservation SC-pin</property>
+  <property name="title">Accommodation Reservation SC-Pin</property>
   <property name="fields">
    <element value="acco_res_sc_pin"/>
   </property>
-  <property name="label">Accommodation Reservation SC-pin</property>
-  <property name="label_edit">Accommodation Reservation SC-pin</property>
+  <property name="label">Accommodation Reservation SC-Pin</property>
+  <property name="label_edit">Accommodation Reservation SC-Pin</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -73,4 +78,5 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+<property name="hidden_empty">True</property>
  </widget>
  <widget name="bed" meta_type="String Widget">
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml	(revision 656)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml	(revision 658)
@@ -17,4 +17,5 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">iso8601_medium_easy</property>
  </widget>
 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
@@ -219,6 +220,6 @@
   <property name="size_max">204800</property>
   <property name="display_external_editor">False</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
+  <property name="display_width">150</property>
+  <property name="display_height">200</property>
   <property name="allow_resize">True</property>
  </widget>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 656)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 658)
@@ -21,4 +21,5 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">iso8601_medium_easy</property>
  </widget>
  <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
@@ -28,5 +29,5 @@
   </property>
   <property name="is_required">True</property>
-  <property name="label">Application PIN</property>
+  <property name="label">Access Code</property>
   <property name="label_edit">Application PIN</property>
   <property name="readonly_layout_modes">
@@ -89,5 +90,5 @@
    <element value="jamb_lastname"/>
   </property>
-  <property name="label">Name</property>
+  <property name="label">Student's Name</property>
   <property name="label_edit">Name</property>    
   <property name="readonly_layout_modes">
@@ -160,5 +161,17 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="passport" meta_type="WAeUP Image 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">State of Origin</property>
+  <property name="label_edit">JAMB State</property>
+  <property name="readonly_layout_modes">
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="passport" meta_type="Photo Widget">
   <property name="title">Passport Picture</property>
   <property name="fields">
@@ -177,6 +190,6 @@
   <property name="size_max">204800</property>
   <property name="display_external_editor">False</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
+  <property name="display_width">150</property>
+  <property name="display_height">200</property>
   <property name="allow_resize">True</property>
  </widget>
@@ -196,4 +209,10 @@
   <row>
    <cell name="jamb_sex" ncols="3"/>
+  </row>
+  <row>
+   <cell name="entry_mode" ncols="3"/>
+  </row>
+  <row>
+   <cell name="jamb_state" ncols="3"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/themes.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/themes.xml	(revision 656)
+++ WAeUP_SRP/trunk/profiles/default/themes.xml	(revision 658)
@@ -9,4 +9,5 @@
   <element key="index_html" value="WAeUP_Student+Default"/>
   <element key="application_slip" value="WAeUP_Student+Slippage"/>
+  <element key="accommodation_slip" value="WAeUP_Student+Slippage"/>
  </property>
  <object name="default" meta_type="Portal Theme"/>
Index: WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml	(revision 656)
+++ WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml	(revision 658)
@@ -8,5 +8,5 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentAccommodation</property>
- <property name="immediate_view">accommodation_slip</property>
+ <property name="immediate_view">accommodation_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -26,8 +26,8 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="accommodation_slip"/>
- <alias from="view" to="accommodation_slip"/>
+ <alias from="(Default)" to="accommodation_view"/>
+ <alias from="view" to="accommodation_view"/>
  <action title="Standard View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/accommodation_slip"
+    condition_expr="" url_expr="string:${object_url}/accommodation_view"
     visible="True">
   <permission value="View"/>
