Index: WAeUP_SRP/trunk/profiles/aaua/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/aaua/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/aaua/layouts/acco_hall.xml	(revision 3870)
@@ -41,6 +41,6 @@
   </property>
   <property name="is_required">False</property>
-  <property name="label">Beds for NCE-3 Students</property>
-  <property name="label_edit">Beds for NCE-3 Students</property>
+  <property name="label">Beds for Final Students</property>
+  <property name="label_edit">Beds for Final Students</property>
   <property name="help">Name the bedspaces for final year students.
                         Attention: The bed letters must not exceed the number of beds per room.</property>
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for Returning Students</property>
+  <property name="label_edit">Beds for Returning Students</property>
+  <property name="help">Name the bedspaces for final returning students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>   
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -55,6 +71,6 @@
   </property>
   <property name="is_required">False</property>
-  <property name="label">Beds for NCE-1 Students</property>
-  <property name="label_edit">Beds for NCE-1 Students</property>
+  <property name="label">Beds for Fresh Students</property>
+  <property name="label_edit">Beds for Fresh Students</property>
   <property name="help">Name the beds for first year students.
                         Attention: The bed letters must not exceed the number of beds per room.</property>
@@ -203,9 +219,12 @@
   <row>
    <cell name="sort_id"/>
-  </row>
+  </row>  
   <row>
    <cell name="maintenance_code"/>
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>
+  <row>
    <cell name="text"/>
   </row>
@@ -229,9 +248,9 @@
   </row>
   <row>
-   <cell name="beds_for_pre"/>
-  </row>  
-  <row>
    <cell name="beds_for_fresh"/>
   </row>
+  <row>
+   <cell name="beds_for_returning"/>
+  </row>      
   <row>
    <cell name="beds_for_final"/>
Index: WAeUP_SRP/trunk/profiles/aaue/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/aaue/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/aaue/layouts/acco_hall.xml	(revision 3870)
@@ -41,6 +41,6 @@
   </property>
   <property name="is_required">False</property>
-  <property name="label">Beds for NCE-3 Students</property>
-  <property name="label_edit">Beds for NCE-3 Students</property>
+  <property name="label">Beds for Final Students</property>
+  <property name="label_edit">Beds for Final Students</property>
   <property name="help">Name the bedspaces for final year students.
                         Attention: The bed letters must not exceed the number of beds per room.</property>
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for Returning Students</property>
+  <property name="label_edit">Beds for Returning Students</property>
+  <property name="help">Name the bedspaces for final returning students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>   
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -55,6 +71,6 @@
   </property>
   <property name="is_required">False</property>
-  <property name="label">Beds for NCE-1 Students</property>
-  <property name="label_edit">Beds for NCE-1 Students</property>
+  <property name="label">Beds for Fresh Students</property>
+  <property name="label_edit">Beds for Fresh Students</property>
   <property name="help">Name the beds for first year students.
                         Attention: The bed letters must not exceed the number of beds per room.</property>
@@ -203,9 +219,12 @@
   <row>
    <cell name="sort_id"/>
-  </row>
+  </row>  
   <row>
    <cell name="maintenance_code"/>
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>
+  <row>
    <cell name="text"/>
   </row>
@@ -229,9 +248,9 @@
   </row>
   <row>
-   <cell name="beds_for_pre"/>
-  </row>  
-  <row>
    <cell name="beds_for_fresh"/>
   </row>
+  <row>
+   <cell name="beds_for_returning"/>
+  </row>      
   <row>
    <cell name="beds_for_final"/>
Index: WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml	(revision 3870)
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for NCE-2 Students</property>
+  <property name="label_edit">Beds for NCE-2 Students</property>
+  <property name="help">Name the bedspaces for final returning (NCE-2 students)) students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget> 
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -238,4 +254,7 @@
   </row>
   <row>
+   <cell name="beds_for_returning"/>
+  </row>  
+  <row>
    <cell name="beds_for_final"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/fceoyo/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/fceoyo/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/fceoyo/layouts/acco_hall.xml	(revision 3870)
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for NCE-2 Students</property>
+  <property name="label_edit">Beds for NCE-2 Students</property>
+  <property name="help">Name the bedspaces for final returning (NCE-2 students)) students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget> 
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -208,4 +224,7 @@
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>  
+  <row>
    <cell name="text"/>
   </row>
@@ -235,4 +254,7 @@
   </row>
   <row>
+   <cell name="beds_for_returning"/>
+  </row>  
+  <row>
    <cell name="beds_for_final"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/nau/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/nau/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/nau/layouts/acco_hall.xml	(revision 3870)
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for Returning Students</property>
+  <property name="label_edit">Beds for Returning Students</property>
+  <property name="help">Name the bedspaces for final returning students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>  
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -235,4 +251,7 @@
   </row>
   <row>
+   <cell name="beds_for_returning"/>
+  </row>    
+  <row>
    <cell name="beds_for_final"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/ois/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/ois/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/ois/layouts/acco_hall.xml	(revision 3870)
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for NCE-2 Students</property>
+  <property name="label_edit">Beds for NCE-2 Students</property>
+  <property name="help">Name the bedspaces for final returning (NCE-2 students)) students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget> 
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -208,4 +224,7 @@
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>  
+  <row>
    <cell name="text"/>
   </row>
@@ -235,4 +254,7 @@
   </row>
   <row>
+   <cell name="beds_for_returning"/>
+  </row>  
+  <row>
    <cell name="beds_for_final"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/uniben/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/uniben/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/uniben/layouts/acco_hall.xml	(revision 3870)
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for Returning Students</property>
+  <property name="label_edit">Beds for Returning Students</property>
+  <property name="help">Name the bedspaces for final returning students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>   
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -235,4 +251,7 @@
   </row>
   <row>
+   <cell name="beds_for_returning"/>
+  </row>      
+  <row>
    <cell name="beds_for_final"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/unilorin/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/unilorin/layouts/acco_hall.xml	(revision 3868)
+++ WAeUP_SRP/trunk/profiles/unilorin/layouts/acco_hall.xml	(revision 3870)
@@ -41,6 +41,6 @@
   </property>
   <property name="is_required">False</property>
-  <property name="label">Beds for NCE-3 Students</property>
-  <property name="label_edit">Beds for NCE-3 Students</property>
+  <property name="label">Beds for Final Students</property>
+  <property name="label_edit">Beds for Final Students</property>
   <property name="help">Name the bedspaces for final year students.
                         Attention: The bed letters must not exceed the number of beds per room.</property>
@@ -50,4 +50,20 @@
   <property name="vocabulary">waeup_bed_letters</property>
  </widget>
+ 
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for Returning Students</property>
+  <property name="label_edit">Beds for Returning Students</property>
+  <property name="help">Name the bedspaces for final returning students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>   
+ 
  <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -55,6 +71,6 @@
   </property>
   <property name="is_required">False</property>
-  <property name="label">Beds for NCE-1 Students</property>
-  <property name="label_edit">Beds for NCE-1 Students</property>
+  <property name="label">Beds for Fresh Students</property>
+  <property name="label_edit">Beds for Fresh Students</property>
   <property name="help">Name the beds for first year students.
                         Attention: The bed letters must not exceed the number of beds per room.</property>
@@ -203,9 +219,12 @@
   <row>
    <cell name="sort_id"/>
-  </row>
+  </row>  
   <row>
    <cell name="maintenance_code"/>
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>
+  <row>
    <cell name="text"/>
   </row>
@@ -229,9 +248,9 @@
   </row>
   <row>
-   <cell name="beds_for_pre"/>
-  </row>  
-  <row>
    <cell name="beds_for_fresh"/>
   </row>
+  <row>
+   <cell name="beds_for_returning"/>
+  </row>      
   <row>
    <cell name="beds_for_final"/>
