diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index f0b0624439f..ac91f56a508 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -8,28 +8,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration">
+                    <header>
+                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
+                        <button special="cancel" string="Close" icon="gtk-cancel"/>
+                    </header>
                     <group>
-                        <group colspan="4">
-                            <separator string="Declare Periodical VAT" colspan="4"/>
+                        <group string="Declare Periodical VAT">
                             <field name="period_id" widget="selection"/>
                             <field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
-                            <newline/>
-                            <separator string="Advanced Options" colspan="4"/>
+                        </group>
+                        <group string="Advanced Options">
                             <field name="ask_restitution"/>
                             <field name="ask_payment"/>
-                            <field name="client_nihil" string="Is Last Declaration"/><label/>
-                        </group>
-                        <group colspan="4">
-                            <separator string="Comments" colspan="4"/>
-                            <field colspan="4" name="comments" nolabel="1"/>
-                        </group>
-                        <group>
-                            <separator colspan="4"/>
-                            <newline/>
-                            <button special="cancel" string="Close" icon="gtk-cancel"/>
-                            <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
+                            <field name="client_nihil" string="Is Last Declaration"/>
                         </group>
                     </group>
+                    <separator string="Comments"/>
+                    <field name="comments"/>
                 </form>
             </field>
         </record>
@@ -40,14 +35,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save xml">
-                    <group colspan="3">
-                        <label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
-                        <field name="name"/><newline/>
-                        <field name="file_save" readonly="True" filename="name"/>
-                        <newline/>
-                        <separator colspan="4"/><label/>
+                    <header>
                         <button special="cancel" string="Ok" icon="gtk-ok"/>
-                    </group>
+                    </header>
+                    <label string="Save the File with '.xml' extension."/>
+                    <field name="name"/>
+                    <field name="file_save" readonly="True" filename="name"/>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml
index 27a6f7f710e..0a2955b81a3 100644
--- a/addons/l10n_br/l10n_br_view.xml
+++ b/addons/l10n_br/l10n_br_view.xml
@@ -1,80 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-	
-		<record model="ir.ui.view" id="view_l10n_br_cst_template_form">
-			<field name="name">l10n_br.cst.form</field>
-			<field name="model">l10n_br_account.cst.template</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Tax Situation Code Template">
-					<field name="code" select="1"/>
-					<field name="name" select="1"/>
-					<field name="tax_code_template_id" select="2"/>
-				</form>
-			</field>
-		</record>
+    <data>
+    
+        <record model="ir.ui.view" id="view_l10n_br_cst_template_form">
+            <field name="name">l10n_br.cst.form</field>
+            <field name="model">l10n_br_account.cst.template</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tax Situation Code Template">
+                    <group col="4">
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="tax_code_template_id"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_l10n_br_cst_template_tree">
-			<field name="name">l10n_br.cst.tree</field>
-			<field name="model">l10n_br_account.cst.template</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Tax Situation Code Template">
-					<field name="code" select="1"/>
-					<field name="name" select="1"/>
-					<field name="tax_code_template_id" select="2"/>
-				</tree>
-			</field>
-		</record>
-		
-		<record model="ir.actions.act_window" id="action_l10n_br_cst_template_form">
-			<field name="name">Tax Situation Code Template</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">l10n_br_account.cst.template</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_type">form</field>
-			<field name="view_id" ref="view_l10n_br_cst_template_tree"/>
-		</record>
-			
-		<record model="ir.ui.view" id="view_l10n_br_cst_form">
-			<field name="name">l10n_br.cst.form</field>
-			<field name="model">l10n_br_account.cst</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Tax Situation Code">
-					<field name="code" select="1"/>
-					<field name="name" select="1"/>
-					<field name="tax_code_id" select="2"/>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_l10n_br_cst_template_tree">
+            <field name="name">l10n_br.cst.tree</field>
+            <field name="model">l10n_br_account.cst.template</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tax Situation Code Template">
+                    <field name="code" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="tax_code_template_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_l10n_br_cst_template_form">
+            <field name="name">Tax Situation Code Template</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l10n_br_account.cst.template</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_l10n_br_cst_template_tree"/>
+        </record>
+            
+        <record model="ir.ui.view" id="view_l10n_br_cst_form">
+            <field name="name">l10n_br.cst.form</field>
+            <field name="model">l10n_br_account.cst</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tax Situation Code">
+                    <group col="4">
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="tax_code_id"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_l10n_br_cst_tree">
-			<field name="name">l10n_br.cst.tree</field>
-			<field name="model">l10n_br_account.cst</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Tax Situation Code">
-					<field name="code" select="1"/>
-					<field name="name" select="1"/>
-					<field name="tax_code_id" select="2"/>
-				</tree>
-			</field>
-		</record>
-		
-		<record model="ir.actions.act_window" id="action_l10n_br_cst_form">
-			<field name="name">Tax Situation Code</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">l10n_br_account.cst</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_type">form</field>
-			<field name="view_id" ref="view_l10n_br_cst_tree"/>
-		</record>
-		
-		<menuitem name="Tax Situation Code Template" id="menu_action_l10n_br_cst_template" sequence="99" parent="account.account_template_taxes" action="action_l10n_br_cst_template_form"/>
-		
-		<menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form" groups="base.group_no_one"/>
-		
-	</data>
-</openerp>
\ No newline at end of file
+        <record model="ir.ui.view" id="view_l10n_br_cst_tree">
+            <field name="name">l10n_br.cst.tree</field>
+            <field name="model">l10n_br_account.cst</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tax Situation Code">
+                    <field name="code" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="tax_code_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_l10n_br_cst_form">
+            <field name="name">Tax Situation Code</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l10n_br_account.cst</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_l10n_br_cst_tree"/>
+        </record>
+        
+        <menuitem name="Tax Situation Code Template" id="menu_action_l10n_br_cst_template" sequence="99" parent="account.account_template_taxes" action="action_l10n_br_cst_template_form"/>
+        
+        <menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form" groups="base.group_no_one"/>
+        
+    </data>
+</openerp>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 0806a9010e9..ec7ba5f29f7 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -8,13 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BVR Import">
-                    <group width="525" colspan="4">
+                    <header>
+                        button name="import_bvr" string="Import" type="object" icon="gtk-ok"  colspan="2"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
+                    </header>
+                    <group>
                         <field name="file"/>
-                        <newline/>
-                        <group colspan="4">
-                            <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
-                            <button name="import_bvr" string="Import" type="object" icon="gtk-ok"  colspan="2"/>
-                        </group>
                     </group>
                 </form>
             </field>
@@ -42,4 +41,4 @@
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index a3ba33b7354..9f9812f2499 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results">
-                    <group colspan="4">
+                    <header>
+                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
+                    </header>
+                    <group>
                         <field name="dta_file"/>
-                        <group colspan="4">
-                            <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
-                            <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
-                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index eb66de9f012..c78e3195088 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,14 +8,13 @@
             <field name="model">account.bilan.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Bilan Report">
-	               <field name="fiscalyear_id"/>
-	               <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Bilan Report">
+                   <header>
                         <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/>
-                    </group>
-	             </form>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   </header>
+                   <field name="fiscalyear_id"/>
+                 </form>
             </field>
         </record>
 
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index 5499e2fe1cf..fa52eb6a663 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -7,14 +7,13 @@
             <field name="model">account.cdr.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string='Compte de resultant'>
-	               <field name="fiscalyear_id"/>
-	               <separator colspan="4"/>
-                    <group colspan="4" col="6">
+                <form string='Compte de resultat'>
+                    <header>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                         <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/>
-                    </group>
-	             </form>
+                    </header>
+                    <field name="fiscalyear_id"/>
+                 </form>
             </field>
         </record>
 
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index a8349de0bba..c45929da727 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -6,15 +6,16 @@
             <field name="model">vat.declaration.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Print Tax Statements">
-	               <field name="tax_code_id" widget="selection"/>
-	               <field name="period_id" widget="selection"/>
-	               <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Print Tax Statements">
+                   <header>
                         <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/>
-                    </group>
-	             </form>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   </header>
+                   <group col="4">
+                       <field name="tax_code_id" widget="selection"/>
+                       <field name="period_id" widget="selection"/>
+                   </group>
+                 </form>
             </field>
         </record>
 
@@ -32,4 +33,5 @@
        <menuitem name="VAT Declaration" id="legal_lu_vat" parent="legal_lu" action="action_vat_report"/>
 
     </data>
+
 </openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 57360829e19..42eb90311ea 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,20 +23,22 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
-                <sheet string="Order" layout="auto">
-                    <field name="user_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="product" select="1" on_change="onchange_product(product)"/>
-                    <field name="category"/>
-                    <field name="descript"/>
-                    <field name="price"/>
-                    <field name="cashmove"/>
+                <sheet string="Order">
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="date"/>
+                        <field name="product" on_change="onchange_product(product)"/>
+                        <field name="category"/>
+                        <field name="descript"/>
+                        <field name="price"/>
+                        <field name="cashmove"/>
+                    </group>
                 </sheet>
                 </form>
             </field>
@@ -104,8 +106,8 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes">
-                    <field name="name" select="1"/>
-                    <field name="manager" select="1"/>
+                    <field name="name"/>
+                    <field name="manager"/>
                 </form>
             </field>
         </record>
@@ -118,9 +120,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
-                    <field name="name" select="1"/>
-                    <field name="manager" select="1"/>
-                    <field name="sum_remain" select="1"/>
+                    <field name="name"/>
+                    <field name="manager"/>
+                    <field name="sum_remain"/>
                 </tree>
             </field>
         </record>
@@ -144,12 +146,14 @@
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
                 <form string="CashMove">
-                    <field name="name" select="1"/>
-                    <field name="user_cashmove" select="1"/>
-                    <field name="amount"/>
-                    <field name="box" select="1"/>
-                    <field name="create_date" select="1"/>
-                    <field name="active" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="user_cashmove"/>
+                        <field name="amount"/>
+                        <field name="box"/>
+                        <field name="create_date"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -163,10 +167,10 @@
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
                     <field name="create_date"/>
-                    <field name="box" select="1"/>
-                    <field name="name" select="1" required="1"/>
-                    <field name="user_cashmove" select="1"/>
-                    <field name="amount" select="1" sum="Total amount"/>
+                    <field name="box"/>
+                    <field name="name" required="1"/>
+                    <field name="user_cashmove"/>
+                    <field name="amount" sum="Total amount"/>
                 </tree>
             </field>
         </record>
@@ -217,7 +221,7 @@
             <field name="arch" type="xml">
                 <form string="Category">
                     <separator string="Category Related to Products" colspan="4"/>
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                 </form>
             </field>
         </record>
@@ -230,7 +234,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Order">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
@@ -251,7 +255,7 @@
             <field name="arch" type="xml">
                 <form string="Products">
                      <group col="6">
-                          <field name="name" select="1"/>
+                          <field name="name"/>
                           <field name="category_id"/>
                           <field name="price" />
                      </group>
@@ -331,9 +335,9 @@
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="box" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="amount" select="1" sum="Total box" />
+                    <field name="box"/>
+                    <field name="user_id"/>
+                    <field name="amount" sum="Total box" />
                 </tree>
             </field>
         </record>
@@ -346,9 +350,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Box Amount by User">
-                    <field name="user_id" select="1"/>
-                    <field name="box" select="1"/>
-                    <field name="amount" select="1"/>
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="box"/>
+                        <field name="amount"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index ce463c5a02a..97219507eed 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -4,23 +4,20 @@
 
 <!-- Lunch cashbox  -->
 
-  		<record id="view_lunch_cashbox_clean" model="ir.ui.view">
+          <record id="view_lunch_cashbox_clean" model="ir.ui.view">
             <field name="name">lunch.cashbox.clean.form</field>
             <field name="model">lunch.cashbox.clean</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox">
-                	<group colspan="4" >
-                		 <label string="Are you sure you want to reset this cashbox ?"/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="No"/>
-                    	<button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
-                   </group>
+                    <header>
+                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
+                        <button  icon="gtk-cancel" special="cancel" string="No"/>
+                    </header>
+                    <label string="Are you sure you want to reset this cashbox ?"/>
                </form>
             </field>
-  		</record>
+          </record>
 
         <record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
             <field name="name">Set CashBox to Zero</field>
@@ -32,9 +29,9 @@
         </record>
 
         <act_window id="action_lunch_cashbox_clean_values"
-    		key2="client_action_multi" name="Set CashBox to Zero"
-    		res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
-    		view_mode="form" target="new" view_type="form" />
+            key2="client_action_multi" name="Set CashBox to Zero"
+            res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
+            view_mode="form" target="new" view_type="form" />
 
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 3377c98b0e7..69d3c4cc46d 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -4,23 +4,22 @@
 
 <!-- cancel order  -->
 
-  		<record id="view_lunch_order_cancel" model="ir.ui.view">
+        <record id="view_lunch_order_cancel" model="ir.ui.view">
             <field name="name">lunch.order.cancel.form</field>
             <field name="model">lunch.order.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order">
-                	<group colspan="4" >
-                		 <label string="Are you sure you want to cancel this order ?"/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="No"/>
-                    	<button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
+                    <header>
+                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
+                        <button  icon="gtk-cancel" special="cancel" string="No"/>
+                    </header>
+                    <group col="4" >
+                        <label string="Are you sure you want to cancel this order ?"/>
                    </group>
                </form>
             </field>
-  		</record>
+        </record>
 
         <record id="action_lunch_order_cancel" model="ir.actions.act_window">
             <field name="name">Cancel Order</field>
@@ -32,9 +31,9 @@
         </record>
         
         <act_window id="action_lunch_order_cancel_values"
-    		key2="client_action_multi" name="Cancel Order"
-    		res_model="lunch.order.cancel" src_model="lunch.order"
-     		view_mode="form" target="new" view_type="form"/>
+            key2="client_action_multi" name="Cancel Order"
+            res_model="lunch.order.cancel" src_model="lunch.order"
+            view_mode="form" target="new" view_type="form"/>
         
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index eba7d12c846..c15023ee124 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -4,25 +4,23 @@
 
 <!-- confirm order  -->
 
-  		<record id="view_lunch_order_confirm" model="ir.ui.view">
+        <record id="view_lunch_order_confirm" model="ir.ui.view">
             <field name="name">lunch.order.confirm.form</field>
             <field name="model">lunch.order.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm">
-                	<group colspan="4" >
-                		 <separator string="Orders Confirmation" colspan="4"/>
-                		 <field name="confirm_cashbox"/>
-                		 <newline/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
+                    <header>
+                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
+                        <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group col="4">
+                         <separator string="Orders Confirmation" colspan="4"/>
+                         <field name="confirm_cashbox"/>
                    </group>
                </form>
             </field>
-  		</record>
+        </record>
 
         <record id="action_lunch_order_confirm" model="ir.actions.act_window">
             <field name="name">Confirm Order</field>
@@ -34,9 +32,9 @@
         </record>
 
         <act_window id="action_lunch_order_confirm_values"
-    		key2="client_action_multi" name="Confirm Order"
-    		res_model="lunch.order.confirm" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form"/>
+            key2="client_action_multi" name="Confirm Order"
+            res_model="lunch.order.confirm" src_model="lunch.order"
+            view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 5f78de51c1d..7dc12d52e8f 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -26,17 +26,19 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Message">
-                    <group colspan="2" col="2">
-                        <field name="subject"/>
-                        <field name="date"/>
-                        <field name="type"/>
-                        <field name="body_text"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="user_id" string="User" readonly="0"/>
-                        <field name="model"/>
-                        <field name="res_id"/>
-                        <field name="parent_id"/>
+                    <group>
+                        <group>
+                            <field name="subject"/>
+                            <field name="date"/>
+                            <field name="type"/>
+                            <field name="body_text"/>
+                        </group>
+                        <group>
+                            <field name="user_id" string="User"/>
+                            <field name="model"/>
+                            <field name="res_id"/>
+                            <field name="parent_id"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -77,52 +79,47 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email message">
-                    <group colspan="4" col="6">
-                        <field name="subject" colspan="4"/>
-                        <field name="date"/>
-                        <field name="user_id" string="User"/>
+                    <label for="subject" class="oe_form_readonly_hidden"/>
+                    <h1><field name="subject"/></h1>
+                    <label for="user_id"/>
+                    <h2><field name="user_id" class="or_form_inline" string="User"/> on <field name="date" class="or_form_inline"/></h2>
+                    <group col="4">
                         <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
                         <field name="type"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Details">
-                            <group col="2" colspan="2">
-                                <separator string="Recipients" colspan="4"/>
+                            <group string="Recipients">
                                 <field name="email_from"/>
                                 <field name="email_to"/>
                                 <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
                                 <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
                                 <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
                             </group>
-                            <group col="4" colspan="2">
-                                <separator string="Message Details" colspan="4"/>
+                            <group col="4" string="Message Details">
                                 <field name="model"/>
                                 <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
                                 <field name="res_id"/>
                                 <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
                                 <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
                             </group>
-                            <notebook colspan="4">
+                            <notebook>
                                 <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
-                                    <field name="body_html" widget="text_html" nolabel="1" colspan="4"/>
+                                    <field name="body_html" widget="text_html"/>
                                 </page>
                                 <page string="Body (Plain)">
-                                    <field name="body_text" colspan="4" widget="text" nolabel="1"/>
+                                    <field name="body_text" widget="text"/>
                                 </page>
                             </notebook>
-                            <separator string="" colspan="4"/>
-                            <group col="6" colspan="6">
+                            <group col="5">
                                 <field name="state" colspan="2"/>
                                 <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
-                                <group colspan="2">
-                                    <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                     context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                                </group>
                             </group>
                         </page>
                         <page string="Attachments">
-                            <separator string="Attachments" colspan="4"/>
-                            <field name="attachment_ids" nolabel="1" colspan="4"/>
+                            <field name="attachment_ids"/>
                         </page>
                         <page string="Advanced" groups="base.group_no_one">
                             <group col="2" colspan="4">
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 7a36956a9dc..481655d7be1 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -6,17 +6,17 @@
             <field name="model">marketing.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Marketing" layout="manual">
+                <form string="Configure Marketing">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Campaigns" colspan="4"/>
-                        <field name="module_marketing_campaign"/>
-                        <field name="module_marketing_campaign_crm_demo"/>
-                        <newline/>
-                        <field name="module_crm_profiling"/>
+                    <sheet>
+                        <group col="4" string="Campaigns"/>
+                            <field name="module_marketing_campaign"/>
+                            <field name="module_marketing_campaign_crm_demo"/>
+                            <field name="module_crm_profiling"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 9be08469cf4..be4c837402c 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -15,7 +15,7 @@
         <field name="model">marketing.campaign</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form>
             <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Done" states="running"/>
@@ -23,27 +23,24 @@
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
-            <sheet string="Campaign" layout="auto">
-                <group colspan="4" col="6">
-                    <group colspan="2" col="2">
-                        <separator string="Campaign" colspan="2" />
-                        <field name="name" select="1"/>
+            <sheet string="Campaign">
+                <group>
+                    <group string="Campaign">
+                        <field name="name"/>
                         <field name="mode"/>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Resource" colspan="2" />
+                    <group string="Resource">
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
                         <field name="unique_field_id"/>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Cost" colspan="2" />
+                    <group string="Cost">
                         <field name="fixed_cost"/>
                     </group>
                 </group>
-                <field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
-              </sheet>
-              </form>
+                <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
+            </sheet>
+            </form>
         </field>
     </record>
 
@@ -53,8 +50,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Campaigns">
-                <field name="name" select="1"/>
-                <field name="object_id" select="1"/>
+                <field name="name"/>
+                <field name="object_id"/>
                 <field name="mode"/>
                 <field name="fixed_cost"/>
                 <field name="state"/>
@@ -145,28 +142,28 @@
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
             <sheet string="Segments" layout="auto">
-                <group colspan="2" col="2">
-                    <separator string="Segment" colspan="4"/>
-                    <field name="name"/>
-                    <field name="campaign_id" select="1" on_change="onchange_campaign_id(campaign_id)"/>
-                    <field name="object_id" invisible="1"/>
-                </group>
-                <group colspan="2" col="2">
-                    <separator string="Filter" colspan="4"/>
-                    <field name="ir_filter_id"/>
-                </group>
-                <newline/>
-                <group colspan="2" col="4">
-                   <separator string="Synchronization" colspan="4"/>
-                   <field name="sync_mode" required="True" colspan="4"/>
-                   <field name="sync_last_date" colspan="3"/>
-                   <button string="Synchronize Manually" states="running" name="synchroniz" icon="terp-project" type="object"/>
-                   <field name="date_next_sync" colspan="3"/>
-                </group>
-                <group colspan="2" col="2">
-                    <separator string="History" colspan="2"/>
-                    <field name="date_run" readonly="1"/>
-                    <field name="date_done" readonly="1"/>
+                <group>
+                    <group string="Segment">
+                        <field name="name"/>
+                        <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
+                        <field name="object_id" invisible="1"/>
+                    </group>
+                    <group string="Filter">
+                        <field name="ir_filter_id"/>
+                    </group>
+                    <group string="Synchronization">
+                       <field name="sync_mode" required="True"/>
+                       <label for="sync_last_date"/>
+                       <div>
+                           <field name="sync_last_date" class="oe_form_inline"/>
+                           <button string="Synchronize Manually" states="running" name="synchroniz" type="object"/>
+                       </div>
+                       <field name="date_next_sync"/>
+                    </group>
+                    <group string="History">
+                        <field name="date_run" readonly="1"/>
+                        <field name="date_done" readonly="1"/>
+                    </group>
                 </group>
             </sheet>
             </form>
@@ -244,40 +241,34 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Activities">
-                <group colspan="2" col="2">
-                    <separator string="Activity" colspan="2"/>
-                    <field name="name" select="1"/>
-                    <field name="signal" groups="base.group_no_one"/>
-                    <field name="start"/>
-                    <field name="object_id" invisible="1"/>
-                    <field name="campaign_id" invisible="1"/>
+                <group>
+                    <group string="Activity">
+                        <field name="name"/>
+                        <field name="signal" groups="base.group_no_one"/>
+                        <field name="start"/>
+                        <field name="object_id" invisible="1"/>
+                        <field name="campaign_id" invisible="1"/>
+                    </group>
+                    <group string="Cost / Revenue">
+                        <field name="variable_cost"/>
+                        <field name="revenue"/>
+                    </group>
                 </group>
-                <group colspan="2" col="2">
-                    <separator string="Cost / Revenue" colspan="2"/>
-                    <field name="variable_cost"/>
-                    <field name="revenue"/>
-                </group>
-                <newline/>
-                <group colspan="4" col="4">
-                    <separator string="Condition" colspan="4"/>
+                <group string="Condition" col="4">
                     <field name="condition" widget="char" colspan="4"/>
                     <field name="keep_if_condition_not_met"/>
                 </group>
-                <group colspan="4" col="4">
+                <group col="4">
                     <separator string="Action" colspan="4"/>
                     <field name="type"/>
-                    <group colspan="2" col="2">
-                        <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
-                               context="{'default_model_id':object_id}" />
-                        <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"    />
-                        <group attrs="{ 'invisible':[('type','!=','report')]}">
-                            <field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}"  />
-                            <field name="report_directory_id" attrs="{'required':[('type','=','report')]}"   />
-                        </group>
-                    </group>
+                    <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
+                           context="{'default_model_id':object_id}" />
+                    <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"    />
+                    <field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}"  attrs="{ 'invisible':[('type','!=','report')]}" />
+                    <field name="report_directory_id" attrs="{'required':[('type','=','report')]}"  attrs="{ 'invisible':[('type','!=','report')]}"  />
                 </group>
-                <separator string="Transitions" colspan="4"/>
-                <field name="from_ids" nolabel="1" mode="tree,form" context="{'default_activity_to_id': active_id}" colspan="2">
+                <separator string="Transitions"/>
+                <field name="from_ids" mode="tree,form" context="{'default_activity_to_id': active_id}">
                     <tree string="Incoming Transitions" editable="bottom">
                         <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                         <field name='trigger'/>
@@ -285,10 +276,12 @@
                         <field name="interval_type"/>
                     </tree>
                     <form string="Incoming Transitions">
-                        <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
-                        <field name='trigger'/>
-                        <field name="interval_nbr"/>
-                        <field name="interval_type"/>
+                        <group col="4">
+                            <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
+                            <field name='trigger'/>
+                            <field name="interval_nbr"/>
+                            <field name="interval_type"/>
+                        </group>
                     </form>
                 </field>
                 <field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2">
@@ -299,10 +292,12 @@
                         <field name="interval_type"/>
                     </tree>
                     <form string="Outgoing Transitions">
-                        <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
-                        <field name='trigger'/>
-                        <field name="interval_nbr"/>
-                        <field name="interval_type"/>
+                        <group col="4">
+                            <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
+                            <field name='trigger'/>
+                            <field name="interval_nbr"/>
+                            <field name="interval_type"/>
+                        </group>
                     </form>
                 </field>
             </form>
@@ -315,7 +310,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Activities">
-                <field name="name" select="1"/>
+                <field name="name"/>
                 <field name="condition"/>
                 <field name="type"/>
                 <field name="start"/>
@@ -357,36 +352,30 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form string="Marketing Campaign Activities">
             <header>
                 <button string="Process" states="todo" name="process" type="object"/>
                 <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
                 <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
                 <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
+                <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
             </header>
-            <sheet string="Marketing Campaign Activities" layout="auto">
-                <group colspan="4" col="6">
-                    <group colspan="2" col="2">
-                        <separator string="Campaign Step" colspan="2"/>
-                        <field name="campaign_id" select="1"/>
-                        <field name="segment_id" select="1"/>
-                        <field name="activity_id" context="{'segment_id':segment_id}" select="1"/>
-                    </group><group colspan="2" col="2">
-                        <separator string="Related Resource" colspan="2"/>
+            <sheet>
+                <group>
+                    <group string="Campaign Step">
+                        <field name="campaign_id"/>
+                        <field name="segment_id"/>
+                        <field name="activity_id" context="{'segment_id':segment_id}"/>
+                        <field name="date"/>
+                    </group><group string="Related Resource">
                         <field name="object_id" readonly="True"/>
                         <field name="res_name"/>
                         <field name="res_id"/>
-                        <field name="partner_id" select="1"/>
-                    </group><group colspan="2" col="2">
-                        <separator string="Date" colspan="2"/>
-                        <field name="date"/>
-                        <label string="" colspan="1"/>
-                        <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
+                        <field name="partner_id"/>
                     </group>
                 </group>
-                <group colspan="4" col="4" attrs="{'invisible':[('state','!=','exception')]}">
-                    <separator string="Error Message" colspan="4"/>
-                    <field name="error_msg" nolabel="1" colspan="4"/>
+                <group attrs="{'invisible':[('state','!=','exception')]}" string="Error Message">
+                    <field name="error_msg" nolabel="1" colspan="2"/>
                 </group>
             </sheet>
             </form>