Index: /WAeUP_SRP/fceokene/profiles/default/layouts/acco_hall.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/layouts/acco_hall.xml	(revision 2820)
+++ /WAeUP_SRP/fceokene/profiles/default/layouts/acco_hall.xml	(revision 2821)
@@ -29,6 +29,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>
@@ -43,6 +43,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>
@@ -75,10 +75,11 @@
  </widget>
   <widget name="nr_of_blocks" meta_type="Int Widget">
+  <property name="title">No of Blocks (unused)</property>
     <property name="fields">
       <element value="nr_of_blocks"/>
     </property>
     <property name="is_required">False</property>
-    <property name="label">No of Blocks</property>
-    <property name="label_edit">No of Blocks</property>
+    <property name="label">No of Blocks (unused)</property>
+    <property name="label_edit">No of Blocks (unused)</property>
     <property name="is_limited">True</property>
     <property name="min_value">1</property>
@@ -104,4 +105,17 @@
  <property name="label">Blocks for Female</property>
  <property name="label_edit">Blocks for Female</property>
+ <property name="readonly_layout_modes"/>
+ <property name="hidden_layout_modes"/>
+ <property name="hidden_readonly_layout_modes"/>
+<property name="vocabulary">waeup_block_letters</property>
+</widget>
+<widget name="blocks_for_male" meta_type="MultiSelect Widget">
+ <property name="title">Blocks for Male</property>
+ <property name="fields">
+  <element value="blocks_for_male"/>
+ </property>
+ <property name="is_required">False</property>
+ <property name="label">Blocks for Male</property>
+ <property name="label_edit">Blocks for Male</property>
  <property name="readonly_layout_modes"/>
  <property name="hidden_layout_modes"/>
@@ -179,4 +193,7 @@
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>
+  <row>
    <cell name="text"/>
   </row>
@@ -185,4 +202,7 @@
   </row>
   <row>
+   <cell name="blocks_for_male"/>
+  </row>  
+  <row>
    <cell name="nr_of_blocks"/>
   </row>
@@ -195,7 +215,4 @@
   <row>
    <cell name="beds_per_room"/>
-  </row>
-  <row>
-   <cell name="beds_for_pre"/>
   </row>
   <row>
Index: /WAeUP_SRP/fceokene/profiles/default/schemas/acco_hall.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/schemas/acco_hall.xml	(revision 2820)
+++ /WAeUP_SRP/fceokene/profiles/default/schemas/acco_hall.xml	(revision 2821)
@@ -25,6 +25,6 @@
   <property name="is_searchabletext">False</property>
  </field>
- <field name="blocks_for_female" meta_type="CPS String List Field">
-  </field>
+ <field name="blocks_for_female" meta_type="CPS String List Field" />
+ <field name="blocks_for_male" meta_type="CPS String List Field" />
    <field name="maintenance_code" meta_type="CPS String Field"/>
 </object>
