diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 549de48ee06..ec9a8c72610 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="view_thunderbird_installer" model="ir.ui.view">
-			<field name="name">plugin_thunderbird.installer.view</field>
-			<field name="model">plugin_thunderbird.installer</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.res_config_installer"/>
-			<field name="arch" type="xml">
-				<data>
-					<form position="attributes">
-						<attribute name="string">Install Thunderbird Plug-In</attribute>
-					</form>
-					 <separator string="title" position="before">
-						<label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
-					</separator>
-					<xpath expr="//button[@string='Install Modules']" position="replace">
-						<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-					</xpath>
-					<xpath expr="//button[@string='Cancel']" position="replace"></xpath>
-					<xpath expr="//separator[@string='title']" position="after">
-						<group colspan="8" height="450" width="750">
-							<field name="thunderbird" invisible="1"/>
-							<field name="name" invisible="1"/>
-							<field name="pdf_name" invisible="1"/>
-							<newline/>
-							<field name="plugin_file" filename="name" widget="url"/>
-							<newline/>
-							<field name="pdf_file" filename="pdf_name" widget="url"/>
-							<newline/>
-							<separator string="Installation and Configuration Steps" colspan="4"/>
-							<field name="description" nolabel="1" colspan="8"/>
-						</group>
-					</xpath>
-					<separator string="title" position="attributes">
-						 <attribute name="string">Install Thunderbird Plug-In</attribute>
-					</separator>
-				</data>
-			</field>
-		</record>
+    <data>
+        <record id="view_thunderbird_installer" model="ir.ui.view">
+            <field name="name">plugin_thunderbird.installer.view</field>
+            <field name="model">plugin_thunderbird.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">Install Thunderbird Plug-In</attribute>
+                    </form>
+                     <separator string="title" position="before">
+                        <label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
+                    </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
+                    <xpath expr="//separator[@string='title']" position="after">
+                        <group colspan="8" height="450" width="750">
+                            <field name="thunderbird" invisible="1"/>
+                            <field name="name" invisible="1"/>
+                            <field name="pdf_name" invisible="1"/>
+                            <newline/>
+                            <field name="plugin_file" filename="name" widget="url"/>
+                            <newline/>
+                            <field name="pdf_file" filename="pdf_name" widget="url"/>
+                            <newline/>
+                            <separator string="Installation and Configuration Steps" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="8"/>
+                        </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                         <attribute name="string">Install Thunderbird Plug-In</attribute>
+                    </separator>
+                </data>
+            </field>
+        </record>
 
-		<record id="action_thunderbird_installer" model="ir.actions.act_window">
-		  <field name="name">Install Thunderbird Plug-In</field>
-		  <field name="type">ir.actions.act_window</field>
-		  <field name="res_model">plugin_thunderbird.installer</field>
-		  <field name="view_id" ref="view_thunderbird_installer"/>
-		  <field name="view_type">form</field>
-		  <field name="view_mode">form</field>
-		  <field name="target">new</field>
-		</record>
-	
-		<!-- Sales Configuration -->
-		<record id="view_config_thunderbird_installer" model="ir.ui.view">
-			<field name="name">Sales Application</field>
-			<field name="model">sale.config.settings</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_sale_config_settings"/>
-			<field name="arch" type="xml">
-				<field name="module_plugin_thunderbird" position="after">
-					<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-						<button name="%(action_thunderbird_installer)d" type="action"
-							string="Configure Thunderbird Plugin" icon="gtk-execute"/>
-					</group>
-				</field>
-			</field>
-		</record>
+        <record id="action_thunderbird_installer" model="ir.actions.act_window">
+          <field name="name">Install Thunderbird Plug-In</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">plugin_thunderbird.installer</field>
+          <field name="view_id" ref="view_thunderbird_installer"/>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+        </record>
+    
+        <!-- Sales Configuration -->
+        <record id="view_config_thunderbird_installer" model="ir.ui.view">
+            <field name="name">Sales Application</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="arch" type="xml">
+                <field name="module_plugin_thunderbird" position="after">
+                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <button name="%(action_thunderbird_installer)d" type="action"
+                            string="Configure Thunderbird Plugin" icon="gtk-execute"/>
+                    </group>
+                </field>
+            </field>
+        </record>
 
 <!--      <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>-->
-		<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 670e10feec2..68029a96d7a 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,24 +16,28 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="PoS Orders">
                 <header>
                     <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                    <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
+                    <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
                     <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                 </header>
-                <sheet string="PoS Orders" layout="auto">
-                    <group col="7" colspan="4" class="oe_form_header">
-                        <field name="name"/>
-                        <field name="date_order"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
-                        <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                        </group><group>
+                            <field name="name"/>
+                            <field name="date_order"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Sale Order">
-                            <field name="lines" colspan="4" nolabel="1">
+                            <field name="lines">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
                                     <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
@@ -43,59 +47,59 @@
                                     <field name="price_subtotal_incl"/>
                                 </tree>
                                 <form string="Order lines">
-                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
-                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="price_subtotal" invisible="1"/>
-                                    <field name="price_subtotal_incl" invisible="1"/>
-                                    <field name="notice"/>
+                                    <group col="4">
+                                        <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
+                                        <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                        <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                        <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                        <field name="price_subtotal" invisible="1"/>
+                                        <field name="price_subtotal_incl" invisible="1"/>
+                                        <field name="notice"/>
+                                    </group>
                                 </form>
                             </field>
-                            <group colspan="4" col="7">
+                            <div class="oe_form_subtotal_footer">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
-                                <button name="%(action_pos_discount)d" string="Discount" icon="gtk-remove" type="action" states="draft" />
-                            </group>
+                            </div>
                         </page>
                         <page string="Payment">
-                            <field name="statement_ids" colspan="4" nolabel="1">
+                            <field name="statement_ids">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="journal_id"/>
                                     <field name="statement_id" />
                                     <field name="amount"/>
                                 </tree>
                                 <form string="Statement lines">
-                                    <field name="account_id"/>
-                                    <field name="amount"/>
-                                    <field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
+                                    <group col="4">
+                                        <field name="account_id"/>
+                                        <field name="amount"/>
+                                        <field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
+                                    </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Extra Info">
-                            <group colspan="2" col="2">
-                                <separator string="General Information" colspan="2"/>
+                            <group string="General Information">
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"/>
                                 <field name="user_id"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
                                 <field name="picking_id" readonly="1"/>
                             </group>
-                            <group colspan="2" col="3">
-                                <separator string="Accounting Information" colspan="3"/>
+                            <group string="Accounting Information">
                                 <field name="sale_journal" domain="[('type','=','sale')]"/>
-                                <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
-                                <field name="invoice_id" colspan="2" readonly="1"
+                                <field name="invoice_id" readonly="1"
                                     attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
                                 <button name="%(pos_invoice_report)d" string="Re-Print"
                                     icon="gtk-print" type="action" attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
-                                <field name="account_move" colspan="3" readonly="1"
+                                <field name="account_move" readonly="1"
                                     attrs="{'invisible':[('state','&lt;&gt;','done')]}"/>
                             </group>
                         </page>
                         <page string="Notes" >
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
@@ -201,11 +205,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Order line">
-                    <field name="product_id" />
-                    <field name="qty" />
-                    <field name="discount" />
-                    <field name="price_unit" />
-                    <field name="create_date" />
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="qty" />
+                        <field name="discount" />
+                        <field name="price_unit" />
+                        <field name="create_date" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -248,13 +254,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="user_id"/>
-                    <field name="journal_id"/>
-                    <field name="jl_id"/>
-                    <field name="date_create" widget="date"/>
-                    <field name="no_trans"/>
-                    <field name="amount"/>
-                    <field name="invoice_id"/>
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="journal_id"/>
+                        <field name="jl_id"/>
+                        <field name="date_create" widget="date"/>
+                        <field name="no_trans"/>
+                        <field name="amount"/>
+                        <field name="invoice_id"/>
+                    <group>
                 </form>
             </field>
         </record>
@@ -339,10 +347,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="amount"/>
-                    <field name="user_id"/>
+                    <grouop col="4">
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="amount"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -405,10 +415,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="amount"/>
-                    <field name="user_id"/>
+                    <group col="4">
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="amount"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -471,12 +483,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="user_id"/>
-                    <field name="product_name"/>
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="net_margin_per_qty"/>
-                    <field name="total"/>
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="product_name"/>
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="net_margin_per_qty"/>
+                        <field name="total"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -538,12 +552,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="user_id"/>
-                    <field name="product_name"/>
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="net_margin_per_qty"/>
-                    <field name="total"/>
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="product_name"/>
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="net_margin_per_qty"/>
+                        <field name="total"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -606,8 +622,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                   <group name="status" position="after">
-                      <group colspan="2" col="2" name="pos">
-                          <separator string="Point of Sale" colspan="2"/>
+                      <group name="pos" string="Point of Sale">
                           <field name="pos_categ_id"/>
                       </group>
                   </group>
@@ -636,7 +651,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="PoS Categories">
-                    <group colspan="4" col="6">
+                    <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
                         <field name="sequence"/>
@@ -770,8 +785,8 @@
             <field name="domain">[('origin','like','POS')]</field>
         </record>
 
-		<menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
-		
+        <menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
+        
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
                 id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" />
 
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 2db10e36aa8..9ba291aec8a 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -9,19 +9,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Put Money">
-                    <separator string="Fill in this form if you put money in the cash register:" colspan="4"/>
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="journal_id"/>
-                    <field name="amount"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2"/>
-                         <button icon="gtk-stop" special="cancel"
-                            string="Cancel" />
-                        <button name="get_in" string="Put Money"
-                            colspan="1" type="object" icon="gtk-apply" />
-                      </group>
+                    <header>
+                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" />
+                        <button icon="gtk-stop" special="cancel" string="Cancel" />
+                    </header>
+                    <separator string="Fill in this form if you put money in the cash register:"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="product_id"/>
+                        <field name="journal_id"/>
+                        <field name="amount"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 4f19a407a38..71e788b88fa 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -9,19 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Output Operation">
-                        <separator string="Describe why you take money from the cash register:" colspan="4"/>
+                    <header>
+                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" />
+                        <button icon="gtk-stop" special="cancel" string="Cancel" />
+                    </header>
+                    <group col="4" string="Describe why you take money from the cash register:">
                         <field name="name"/>
                         <field name="product_id"/>
                         <field name="journal_id"/>
                         <field name="amount"/>
-                        <separator colspan="4"/>
-                        <group colspan="4" col="4">
-                            <group col="2" colspan="2"/>
-                             <button icon="gtk-stop" special="cancel"
-                                string="Cancel" />
-                            <button name="get_out" string="Take Money"
-                                colspan="1" type="object" icon="gtk-apply" />
-                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 6d904b79113..aba93d64bd6 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -9,18 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Cash Registers">
-                    <separator colspan="4" string="Do you want to close your cash registers?"/>
-                    <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2"/>
+                    <header>
+                        <button name="close_statement" string="Yes"
+                             type="object" icon="gtk-ok"/>
                         <button icon='gtk-stop' special="cancel"
                             string="No" invisible="context.get('cancel_action')"/>
                         <button icon='gtk-stop' type="object" name="cancel_wizard"
                             string="No" invisible="not context.get('cancel_action')"/>
-                        <button name="close_statement" string="Yes"
-                             type="object" icon="gtk-ok"/>
-                   </group>
+                    </header>
+                    <separator string="Do you want to close your cash registers?"/>
+                    <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 6a0819c06b0..0a573d56049 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -8,18 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post All Orders">
-                <separator string="Generate Journal Entries" colspan="4"/>
-                <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
-                <newline/>
-                <separator colspan="4"/>
-                <group colspan="4" col="4">
-                    <group colspan="2" col="2">
-                    <button icon='gtk-cancel' special="cancel"
-                        string="Cancel" />
-                    <button name="action_confirm" string="Generate Entries"
-                        colspan="1" type="object" icon="gtk-ok"/>
-                    </group>
-                </group>
+                    <header>
+                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok"/>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <separator string="Generate Journal Entries"/>
+                    <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 0b70b3ae2eb..4bc760f7e8e 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -3,27 +3,23 @@
     <data>
         <!--   pos.details -->
 
-		<record id="view_pos_details" model="ir.ui.view">
+        <record id="view_pos_details" model="ir.ui.view">
             <field name="name">POS Details</field>
             <field name="model">pos.details</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Details">
-                    <group col="4" colspan="4">
-                        <separator string="Dates" colspan="4"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <separator string="User" colspan="4"/>
-                        <field name="user_ids" nolabel="1" colspan="4"/>
-                        <separator string="" colspan="4"/>
-                        <label string="" colspan="2"/>
-                        <group colspan="2" col="2">
+                    <header>
                             <button icon='gtk-cancel' special="cancel"
                                     string="Close" />
                             <button name="print_report" string="Print Report"
                                     colspan="1" type="object" icon="gtk-print" />
-                        </group>
+                    </header>
+                    <group col="4" string="Dates">
+                        <field name="date_start"/>
+                        <field name="date_end"/>
                     </group>
+                    <field name="user_ids"/>
                 </form>
             </field>
         </record>
@@ -39,5 +35,5 @@
         </record>
 
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index bb198e29acf..1daf3eb1ec3 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -9,13 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Apply Discount">
-                    <field name="discount" colspan="4"/>
-                    <separator colspan="4" string=""/>
-                    <group colspan="2"/>
-                    <button icon='gtk-cancel' special="cancel"
-                        string="Close" />
-                    <button name="apply_discount" string="Apply Discount"
-                        colspan="1" type="object" icon="gtk-ok" />
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" />
+                    </header>
+                    <field name="discount"/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 0ce17237801..f53d49bd4cc 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -9,15 +9,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Statements">
-                    <separator colspan="4" string="Do you want to open cash registers?"/>
-                    <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab." colspan="4" align="0.0"/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                         <group col="2" colspan="2"/>
-                         <button icon='gtk-stop' special="cancel" string="Cancel"/>
+                    <header>
                          <button name="open_statement" string="Open Registers"
                              type="object" icon="gtk-ok"/>
-                    </group>
+                         <button icon='gtk-stop' special="cancel" string="Cancel"/>
+                    </header>
+                    <separator string="Do you want to open cash registers?"/>
+                    <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index b790d2bac0f..6c42f1296b0 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -8,19 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Add payment :">
-                <group colspan="4" col="4" >
-                    <group colspan="4">
-                        <field name="journal"/>
-                        <field name="amount" />
-                        <field name="payment_name"/>
-                    </group>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group colspan="2"/>
-                    <group colspan="2">
-                        <button icon="gtk-stop" special="cancel" string="Cancel"/>
-                        <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
-                    </group>
+                <header>
+                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
+                    <button icon="gtk-stop" special="cancel" string="Cancel"/>
+                </header>
+                <group col="4">
+                    <field name="journal"/>
+                    <field name="amount" />
+                    <field name="payment_name"/>
                 </group>
             </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index 0d925eb2ba9..ff1dbc01923 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -3,18 +3,14 @@
     <data>        
         <!--   pos.details -->
         
-		<record id="view_pos_payment_report" model="ir.ui.view">
+        <record id="view_pos_payment_report" model="ir.ui.view">
             <field name="name">Payment Report</field>
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Report">
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
+                    <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
+                    <button icon='gtk-cancel' special="cancel" string="Close" />
                 </form>
             </field>
         </record>
@@ -29,5 +25,5 @@
         </record>
 
         
-	</data>
-</openerp>	        
\ No newline at end of file
+    </data>
+</openerp>            
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index 07f978f7d8c..f1577e7b460 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -3,18 +3,16 @@
     <data>
         <!--   pos.details -->
 
-		<record id="view_pos_payment_report" model="ir.ui.view">
+        <record id="view_pos_payment_report" model="ir.ui.view">
             <field name="name">Pyament Report</field>
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pyament Report ">
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
+                    <header>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
+                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                    </header>
                 </form>
             </field>
         </record>
@@ -29,5 +27,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 9d6e925ebd7..0f41e4b719a 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="pos_payment_report_user_form" model="ir.ui.view">
-		    <field name="name">pos.payment.report.user.form</field>
-		    <field name="model">pos.payment.report.user</field>
-		    <field name="type">form</field>
-		    <field name="arch" type="xml">
-				<form string="Sale by User">
-				 	<group col="2" colspan="4">
-					<field name="user_id"/>
-					<button icon='gtk-cancel' special="cancel" string="Close" />
-					<button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
- 					</group >				
-				</form>
-		    </field>
-		</record>
+    <data>
+        <record id="pos_payment_report_user_form" model="ir.ui.view">
+            <field name="name">pos.payment.report.user.form</field>
+            <field name="model">pos.payment.report.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sale by User">
+                    <header>
+                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
+                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                    </header>
+                    <group>
+                        <field name="user_id"/>
+                    </group>
+                </form>
+            </field>
+        </record>
         <record id="action_report_pos_payment_report_user" model="ir.actions.act_window">
             <field name="name">Sales lines by Users</field>
             <field name="type">ir.actions.act_window</field>
@@ -23,5 +25,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-		</data>	        
+        </data>            
 </openerp>              
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 0b8acfd8197..4286b528a09 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -4,20 +4,20 @@
 
     <!--   Pos Receipt -->
 
-		<record id="view_pos_receipt" model="ir.ui.view">
-		      <field name="name">Receipt</field>
-		      <field name="model">pos.receipt</field>
-		      <field name="type">form</field>
-		      <field name="arch" type="xml">
-		        <form string="Receipt :">
-            <separator string="Print the Receipt of the Sale" colspan="4"/>
-		          <button icon='gtk-cancel' special="cancel"
-		                  string="Cancel" />
-		          <button name="print_report" string="Print Receipt"
-		                  colspan="1" type="object" icon="gtk-print" />
-		        </form>
-		      </field>
-    	</record>
+        <record id="view_pos_receipt" model="ir.ui.view">
+              <field name="name">Receipt</field>
+              <field name="model">pos.receipt</field>
+              <field name="type">form</field>
+              <field name="arch" type="xml">
+                <form string="Receipt :">
+                    <header>
+                      <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" />
+                    </header>
+                    <label string="Print the Receipt of the Sale"/>
+                </form>
+              </field>
+        </record>
 
 
       <record id="action_report_pos_receipt" model="ir.actions.act_window">
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index d89eb8f8745..c369bed908c 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,8 +7,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines">
-                    <button icon='gtk-cancel' special="cancel" string="Cancel" />
                     <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/>
+                    <button icon='gtk-cancel' special="cancel" string="Cancel" />
                  </form>
             </field>
         </record>
@@ -40,9 +40,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="line_id" invisible="1"/>
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="quantity" />
+                        <field name="line_id" invisible="1"/>
+                    </group>
                  </form>
             </field>
         </record>   
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index bece120d684..b0f9008b864 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -3,21 +3,23 @@
     <data>
         <!--   pos sales user -->
 
-		<record id="view_pos_sale_user" model="ir.ui.view">
+        <record id="view_pos_sale_user" model="ir.ui.view">
             <field name="name">Sale By User</field>
             <field name="model">pos.sale.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale By User">
-				    <group col="2" colspan="4">
-				    	<field name="date_start"/>
-				    	<field name="date_end"/>
-				    	<field name="user_id"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <header>
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Close" />
+                        <button name="print_report" string="Print Report"
+                            type="object" icon="gtk-ok" />
+                    </header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -32,5 +34,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 7f36272720c..a2cfdf775fa 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -17,21 +17,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Portal Access">
-                    <field name="portal_id" widget="selection"/>
-                    <newline/>
-                    <notebook colspan="4">
-                        <page string="Users">
-                            <field name="user_ids" nolabel="1" colspan="4"/>
-                        </page>
-                        <page string="Invitation message">
-                            <label string="The following text will be included in the welcome email sent to users."/>
-                            <field name="message" nolabel="1" colspan="4"/>
-                        </page>
-                    </notebook>
-                    <label colspan="2"/>
-                    <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                    <button string="Send Invitations"
-                        name="action_create" type="object" icon="gtk-ok"/>
+                    <header>
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Send Invitations"
+                            name="action_create" type="object" icon="gtk-ok"/>
+                    </header>
+                    <group col="4">
+                        <field name="portal_id" widget="selection"/>
+                    </group>
+                    <field name="user_ids"/>
+                    <label string="The following text will be included in the welcome email sent to users."/>
+                    <field name="message"/>
                 </form>
             </field>
         </record>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index dd495757ec1..0ff93076a45 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -14,7 +14,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process">
-                <group colspan="4" col="6">
+                <group col="4">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="active"/>
@@ -37,46 +37,46 @@
 
                                 </group>
                                 <notebook colspan="4">
-	                                <page string="Properties">
-		                                <group colspan="4" col="6">
-		                                    <field name="model_id" select="1"/>
-		                                    <field name="menu_id"/>
-		                                    <field name="help_url" widget="url"/>
-		                                </group>
-		                                <separator string="Conditions" colspan="4"/>
-		                                <field name="model_states"/>
-		                                <field name="condition_ids" nolabel="1" colspan="4">
-			                                <tree string="Other Conditions" editable="top">
-			                                    <field name="name"/>
-			                                    <field name="model_id"/>
-			                                    <field name="model_states"/>
-			                                </tree>
-		                                </field>
-		                            </page>
-                	                <page string="Transitions">
-		                                <group colspan="4" col="4">
-		                                    <group colspan="2" col="2">
-		                                        <field name="transition_in" nolabel="1" height="400">
-		                                            <tree string="Incoming Transitions">
-		                                                <field name="name"/>
-		                                                <field name="source_node_id"/>
-		                                            </tree>
-		                                        </field>
-		                                   </group>
-		                                   <group colspan="2" col="2">
-                		                        <field name="transition_out" nolabel="1" height="400">
-		                                            <tree string="Outgoing Transitions">
-		                                                <field name="name"/>
-		                                                <field name="target_node_id"/>
-		                                            </tree>
-		                                        </field>
-		                                   </group>
-		                                </group>
-		                            </page>
-                	                <page string="Notes">
-	                                   <field name="note" nolabel="1" colspan="4"/>
-	                                </page>
-	                            </notebook>
+                                    <page string="Properties">
+                                        <group colspan="4" col="6">
+                                            <field name="model_id" select="1"/>
+                                            <field name="menu_id"/>
+                                            <field name="help_url" widget="url"/>
+                                        </group>
+                                        <separator string="Conditions" colspan="4"/>
+                                        <field name="model_states"/>
+                                        <field name="condition_ids" nolabel="1" colspan="4">
+                                            <tree string="Other Conditions" editable="top">
+                                                <field name="name"/>
+                                                <field name="model_id"/>
+                                                <field name="model_states"/>
+                                            </tree>
+                                        </field>
+                                    </page>
+                                    <page string="Transitions">
+                                        <group colspan="4" col="4">
+                                            <group colspan="2" col="2">
+                                                <field name="transition_in" nolabel="1" height="400">
+                                                    <tree string="Incoming Transitions">
+                                                        <field name="name"/>
+                                                        <field name="source_node_id"/>
+                                                    </tree>
+                                                </field>
+                                           </group>
+                                           <group colspan="2" col="2">
+                                                <field name="transition_out" nolabel="1" height="400">
+                                                    <tree string="Outgoing Transitions">
+                                                        <field name="name"/>
+                                                        <field name="target_node_id"/>
+                                                    </tree>
+                                                </field>
+                                           </group>
+                                        </group>
+                                    </page>
+                                    <page string="Notes">
+                                       <field name="note" nolabel="1" colspan="4"/>
+                                    </page>
+                                </notebook>
                             </form>
                         </field>
                     </page>
@@ -159,49 +159,41 @@
                     <field name="flow_start"/>
                     <field name="kind" select="1"/>
                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-
                 </group>
-                <notebook colspan="4">
-	                <page string="Properties">
-		                <group colspan="4" col="6">
-		                    <field name="model_id" select="1"/>
-		                    <field name="menu_id"/>
-		                    <field name="help_url" widget="url"/>
-		                </group>
-		                <separator string="Conditions" colspan="4"/>
-		                <field name="model_states"/>
-		                <field name="condition_ids" nolabel="1" colspan="4">
-			                <tree string="Other Conditions" editable="top">
-			                    <field name="name"/>
-			                    <field name="model_id"/>
-			                    <field name="model_states"/>
-			                </tree>
-		                </field>
-		            </page>
-	                <page string="Transitions">
-		                <group colspan="4" col="4">
-		                    <group colspan="2" col="2">
-		                        <field name="transition_in" nolabel="1" height="400">
-		                            <tree string="Incoming Transitions">
-		                                <field name="name"/>
-		                                <field name="source_node_id"/>
-		                            </tree>
-		                        </field>
-		                    </group>
-		                    <group colspan="2" col="2">
-		                        <field name="transition_out" nolabel="1" height="400">
-		                            <tree string="Outgoing Transitions">
-		                                <field name="name"/>
-		                                <field name="target_node_id"/>
-		                            </tree>
-		                        </field>
-		                    </group>
-		                </group>
-		            </page>
-	                <page string="Notes">
-	                   <field name="note" nolabel="1" colspan="4"/>
-	                </page>
-	            </notebook>
+                <notebook>
+                    <page string="Properties">
+                        <group col="4">
+                            <field name="model_id"/>
+                            <field name="menu_id"/>
+                            <field name="help_url" widget="url"/>
+                            <field name="model_states"/>
+                        </group>
+                        <field name="condition_ids">
+                            <tree string="Other Conditions" editable="bottom">
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="model_states"/>
+                            </tree>
+                        </field>
+                    </page>
+                    <page string="Transitions">
+                        <field name="transition_in" nolabel="1" height="400">
+                            <tree string="Incoming Transitions">
+                                <field name="name"/>
+                                <field name="source_node_id"/>
+                            </tree>
+                        </field>
+                        <field name="transition_out" nolabel="1" height="400">
+                            <tree string="Outgoing Transitions">
+                                <field name="name"/>
+                                <field name="target_node_id"/>
+                            </tree>
+                        </field>
+                    </page>
+                    <page string="Notes">
+                       <field name="note"/>
+                    </page>
+                </notebook>
             </form>
         </field>
     </record>
@@ -260,35 +252,36 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition">
-                <group col="6" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="source_node_id" select="1"/>
-                    <field name="target_node_id" select="1"/>
+                <group col="4">
+                    <field name="name"/>
+                    <field name="source_node_id"/>
+                    <field name="target_node_id"/>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                     <page string="Actions">
-                        <field name="action_ids" nolabel="1" colspan="4">
+                        <field name="action_ids">
                             <tree string="Actions">
                                 <field name="name"/>
                                 <field name="state"/>
                                 <field name="action"/>
                             </tree>
                             <form string="Actions">
-                                <field name="name" colspan="4"/>
-                                <newline/>
-                                <field name="state"/>
-                                <field name="action"/>
+                                <group col="4">
+                                    <field name="name" colspan="4"/>
+                                    <field name="state"/>
+                                    <field name="action"/>
+                                </group>
                             </form>
                         </field>
                     </page>
                     <page string="Workflow Transitions">
-                        <field name="transition_ids" colspan="4" nolabel="1"/>
+                        <field name="transition_ids"/>
                     </page>
                     <page string="Associated Groups">
-                        <field name="group_ids" colspan="4" nolabel="1"/>
+                        <field name="group_ids"/>
                     </page>
                     <page string="Notes">
-                        <field name="note" nolabel="1" colspan="4"/>
+                        <field name="note"/>
                     </page>
                 </notebook>
             </form>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 09bf0c6c24f..8c27e964c46 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -46,7 +46,7 @@
             <field name="model">procurement.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Procurement">
                     <header>
                         <button name="button_confirm" states="draft" string="Confirm"/>
                         <button name="button_check" states="confirmed" string="Run Procurement"/>
@@ -54,48 +54,48 @@
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
-                <sheet string="Procurement" layout="auto">
-                    <group col="2" colspan="2" class="oe_form_header">
-                        <separator colspan="2" string="References"/>
-                        <field name="name" string="Procurement Reason"/>
-                        <field name="origin"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <sheet>
+                    <group>
+                        <group string="References">
+                            <field name="name"/>
+                            <field name="origin"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group string="Planification">
+                            <field name="date_planned"/>
+                            <field name="procure_method"/>
+                            <field name="priority"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Planification"/>
-                        <field name="date_planned"/>
-                        <field name="procure_method"/>
-                        <field name="priority"/>
-                    </group>
-                    <notebook colspan="4">
+                    <notebook>
                     <page string="Procurement Details">
-                        <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" domain="[('usage','=','internal')]"/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
+                        <group string="Product &amp; Location" col="4">
+                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                            <field name="product_qty"/>
+                            <field name="product_uom"/>
 
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos"  groups="product.group_uos"/>
-
-                        <separator colspan="4" string="Status"/>
-                        <field colspan="4" name="message" readonly="1"/>
+                            <field name="product_uos_qty" groups="product.group_uos"/>
+                            <field name="product_uos"  groups="product.group_uos"/>
+                        </group>
+                        <separator string="Status"/>
+                        <field name="message"/>
                     </page>
                     <page string="Extra Information">
-                        <separator colspan="4" string="Details"/>
-                        <field name="move_id"/>
-                        <field name="date_close"/>
-                        <field name="close_move"/>
+                        <group string="Details" col="4">
+                            <field name="move_id"/>
+                            <field name="date_close"/>
+                            <field name="close_move"/>
+                        </group>
                     </page>
                     <page string="Notes">
-                        <separator colspan="4" string="Note" />
-                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="note"/>
                     </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 5bbfa01266b..0eb4ce4f227 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,19 +10,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request">
-                    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
-                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                    <field name="qty"/>
-                    <field name="uom_id"/>
-                    <field name="date_planned"/>
-                    <field name="warehouse_id" colspan="4"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="make_procurement" string="Ask New Products"
-                            colspan="1" type="object" icon="gtk-ok" />
+                    <header>
+                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <field name="qty"/>
+                        <field name="uom_id"/>
+                        <field name="date_planned"/>
+                        <field name="warehouse_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 1d071ea300f..2ba1ec638b1 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -10,14 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
-                    <label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
-                    <newline/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
+                    <header>
                         <button name="procure_calculation" string="Compute Procurements"
-                            colspan="1" type="object" icon="gtk-ok" />
-                    </group>
+                            type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <label string="This wizard will schedule procurements."/>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index c8d0d30d1de..f3981c12ca1 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -4,33 +4,31 @@
 
         <!--  Compute Stock Minimum Rules Only -->
 
-		<record id="view_procurement_compute_wizard" model="ir.ui.view">
+        <record id="view_procurement_compute_wizard" model="ir.ui.view">
             <field name="name">Compute Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
-                <label string="Wizard checks all the stock minimum rules and generate procurement order." colspan="4"/>
-				    <separator colspan="4"/>
-				    <field name="automatic"/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="procure_calculation" string="Compute Stock"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <header>
+                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
+                    <group col="2">
+                        <field name="automatic"/>
+                    </group>
                 </form>
             </field>
         </record>
 
         <act_window name="Compute Stock Minimum Rules Only"
-		    res_model="procurement.orderpoint.compute"
-		    src_model="procurement.order"
-		    view_mode="form"
-		    target="new"
+            res_model="procurement.orderpoint.compute"
+            src_model="procurement.order"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
-		    id="action_procurement_compute"/>
+            id="action_procurement_compute"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 00b6225101e..ba5fa764868 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -4,33 +4,30 @@
 
         <!--  Compute Schedulers -->
 
-		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
+        <record id="view_compute_schedulers_wizard" model="ir.ui.view">
             <field name="name">Compute Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scheduler Parameters">
-                <label string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing." colspan="4"/>
-				    <separator colspan="4"/>
-				    <field name="automatic"/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="procure_calculation" string="Compute Schedulers"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <form string="Scheduler Parameters">
+                    <header>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing."/>
+                        <field name="automatic"/>
+                    </group>
                 </form>
             </field>
         </record>
 
          <act_window name="Compute Schedulers"
-		    res_model="procurement.order.compute.all"
-		    src_model="procurement.order"
-		    view_mode="form"
-		    target="new"
+            res_model="procurement.order.compute.all"
+            src_model="procurement.order"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
-		    id="action_compute_schedulers"/>
+            id="action_compute_schedulers"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6072aac86e6..eab9ac4f194 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -69,130 +69,118 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product" layout="auto">
-                    <group colspan="4" col="8">
-                        <group colspan="4" col="2">
-                            <separator string="Name" colspan="2"/>
-                            <field name="name"/>
-                            <field groups="product.group_product_variant" name="variants" />
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Codes" colspan="2"/>
-                            <field name="default_code"/>
-                            <field name="ean13" placeholder="5901234123457" />
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Characteristics" colspan="2"/>
-                            <field name="sale_ok"/>
-                            <field name="purchase_ok"/>
-                        </group>
-                        <group colspan="1" col="1">
-                            <field name="product_image" widget='image' nolabel="1"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
+                    <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="categ_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="categ_id"/></h2>
+
+                    <notebook>
                         <page string="Information">
-                            <group colspan="2" col="2">
-                                <separator string="Procurement" colspan="2"/>
-                                <field name="type"/>
-                                <field name="procure_method"/>
-                                <field name="supply_method"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Base Prices" colspan="2"/>
-                                <field name="list_price"/>
-                                <field name="cost_method"/>
-                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                                <newline/>
-                                <field name="price_margin" groups="product.group_product_variant"/>
-                                <field name="price_extra" groups="product.group_product_variant"/>
-                            </group>
+                            <group>
+                                <group>
+                                    <field name="default_code"/>
+                                    <field name="ean13" placeholder="5901234123457" />
+                                    <field groups="product.group_product_variant" name="variants" />
+                                </group>
+                                <group>
+                                    <field name="sale_ok"/>
+                                    <field name="purchase_ok"/>
+                                </group>
+                                <group string="Procurement">
+                                    <field name="type"/>
+                                    <field name="procure_method"/>
+                                    <field name="supply_method"/>
+                                </group>
+                                <group string="Base Prices">
+                                    <field name="list_price"/>
+                                    <field name="cost_method"/>
+                                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                    <field name="price_margin" groups="product.group_product_variant"/>
+                                    <field name="price_extra" groups="product.group_product_variant"/>
+                                </group>
 
-                            <group colspan="2" col="2" groups="product.group_stock_packaging">
-                                <separator string="Weights" colspan="2"/>
-                                <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                            </group>
+                                <group groups="product.group_stock_packaging" string="Weights">
+                                    <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                    <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                    <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                </group>
 
-                            <group colspan="2" col="2" name="status">
-                                <separator string="Status" colspan="2"/>
-                                <field name="categ_id"/>
-                                <field name="state"/>
-                                <field name="product_manager"/>
-                            </group>
+                                <group name="status" string="Status">
+                                    <field name="state"/>
+                                    <field name="product_manager"/>
+                                </group>
 
-                            <group colspan="2" col="2" name="uom" groups="product.group_uom">
-                                <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                <field name="uom_po_id"/>
-                            </group>
+                                <group name="uom" groups="product.group_uom" string="Unit of Measure">
+                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                    <field name="uom_po_id"/>
+                                </group>
 
-                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
-                                <separator string="Second Unit of Measure" colspan="2"/>
-                                <field name="uos_id"/>
-                                <field name="uos_coeff"/>
-                                <field name="mes_type"/>
+                                <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
+                                    <field name="uos_id"/>
+                                    <field name="uos_coeff"/>
+                                    <field name="mes_type"/>
+                                </group>
                             </group>
-
                         </page>
                         <page string="Procurement &amp; Locations">
-                            <group colspan="2" col="2" name="delay">
-                                <separator string="Delays" colspan="2"/>
-                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                <field name="warranty"/>
-                            </group>
-                            <group colspan="2" col="2" name="store">
-                                <separator string="Storage Localisation" colspan="2"/>
-                                <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
-                                <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                            </group>
-
-                            <group colspan="2" col="2" name="misc">
-                                <separator string="Miscellaneous" colspan="2"/>
-                                <field name="active"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group name="delay" string="Delays">
+                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                    <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                    <field name="warranty"/>
+                                </group>
+                                <group name="store" string="Storage Localisation">
+                                    <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                    <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                    <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                </group>
+                                <group name="misc" string="Miscellaneous">
+                                    <field name="active"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                </group>
                             </group>
 
                         </page>
                         <page string="Suppliers">
-                            <field colspan="4" name="seller_ids" nolabel="1" context="{'uom_id': uom_id}"/>
+                            <field name="seller_ids" context="{'uom_id': uom_id}"/>
                         </page>
                         <page string="Descriptions">
                             <separator string="Description"/>
-                            <field colspan="4" name="description" nolabel="1"/>
+                            <field name="description"/>
                             <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1" placeholder="This note will be displayed on quotations..."/>
+                            <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
                             <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1" placeholder="This note will be displayed on requests for quotation..."/>
+                            <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
                         </page>
                         <page groups="product.group_stock_packaging" string="Packaging">
-                            <field colspan="4" name="packaging" nolabel="1">
+                            <field name="packaging">
                                 <form string="Packaging">
-                                    <field name="ean"/>
-                                    <field name="sequence" invisible="1"/>
-                                    <newline/>
-                                    <field name="qty"/>
-                                    <field name="ul"/>
-                                    <field name="weight_ul"/>
-                                    <separator colspan="4" string="Palletization"/>
-                                    <field name="ul_qty"/>
-                                    <field name="rows"/>
-                                    <field name="weight"/>
-                                    <separator colspan="4" string="Pallet Dimension"/>
-                                    <field name="height"/>
-                                    <field name="width"/>
-                                    <field name="length"/>
+                                    <group col="4">
+                                        <field name="ean"/>
+                                        <field name="sequence" invisible="1"/>
+                                        <newline/>
+                                        <field name="qty"/>
+                                        <field name="ul"/>
+                                        <field name="weight_ul"/>
+                                        <separator colspan="4" string="Palletization"/>
+                                        <field name="ul_qty"/>
+                                        <field name="rows"/>
+                                        <field name="weight"/>
+                                        <separator colspan="4" string="Pallet Dimension"/>
+                                        <field name="height"/>
+                                        <field name="width"/>
+                                        <field name="length"/>
+                                    </group>
                                     <separator colspan="4" string="Description"/>
-                                    <field colspan="4" name="name" nolabel="1"/>
+                                    <field name="name"/>
                                 </form>
                             </field>
                         </page>
                     </notebook>
-                <div class="oe_form_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -317,11 +305,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Categories">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="sequence" invisible="1"/>
-                    <field name="type"/>
-                    <newline/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="sequence" invisible="1"/>
+                        <field name="type"/>
+                    </group>
                 </form>
             </field>
         </record>