diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c401c4b1e88..f8a3e9ef5f9 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -12,14 +12,16 @@
             <field name="model">product.pricelist.version</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Pricelist Version">
-                    <field name="name" select="1"/>
-                    <field name="active"/>
-                    <field colspan="4" name="pricelist_id" select="1"/>
-                    <field name="date_start" select="1"/>
-                    <field name="date_end" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
+                <form string="Pricelist Version" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="active"/>
+                        <field colspan="4" name="pricelist_id"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <field name="items_id"/>
                 </form>
             </field>
         </record>
@@ -56,10 +58,10 @@
             <field name="arch" type="xml">
                 <tree string="Products Listprices Items">
                     <field name="sequence"/>
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                     <field name="product_id"/>
-                    <field name="product_tmpl_id" select="1" groups="product.group_product_variant"/>
-                    <field name="categ_id" select="1"/>
+                    <field name="product_tmpl_id" groups="product.group_product_variant"/>
+                    <field name="categ_id"/>
                     <field name="min_quantity"/>
                     <field name="base"/>
                 </tree>
@@ -71,20 +73,22 @@
             <field name="model">product.pricelist.item</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Products Listprices Items">
-                    <separator colspan="4" string="Rules Test Match"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
-                    <field name="product_tmpl_id" select="1" groups="product.group_product_variant"/>
-                    <field name="categ_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="min_quantity"/>
-                    <field name="sequence"/>
-                    <separator colspan="4" string="Price Computation"/>
+                <form string="Products Listprices Items" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field colspan="4" name="name"/></h1>
 
-                    <field name="base"/>
-                    <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+                    <group col="4">
+                        <field name="product_id" on_change="product_id_change(product_id)"/>
+                        <field name="product_tmpl_id" groups="product.group_product_variant"/>
+                        <field name="categ_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="min_quantity"/>
+                        <field name="sequence"/>
+                    </group>
+                    <group col="4" string="Price Computation">
+                        <field name="base"/>
+                        <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+                    </group>
                     <group col="6" colspan="5">
                         <label string="New Price ="/>
                         <label string="Base Price"/>
@@ -135,19 +139,26 @@
             <field name="model">product.pricelist</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Products Price List">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="type" select="1"/>
-                    <field name="currency_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field colspan="4" name="version_id" nolabel="1">
-                        <form string="Pricelist Version">
-                            <field name="name" select="1"/>
-                            <field name="active"/>
-                            <field name="date_start" select="1"/>
-                            <field name="date_end" select="1"/>
-                            <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
+                <form string="Products Price List" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <group col="4">
+                        <field name="active"/>
+                        <field name="type"/>
+                        <field name="currency_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <field name="version_id">
+                        <form string="Pricelist Version" version="7.0">
+                            <group col="4">
+                                <field name="name"/>
+                                <field name="active"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                            </group>
+                            <field name="items_id"/>
                         </form>
                         <tree string="Pricelist Version">
                             <field name="name"/>
@@ -188,11 +199,13 @@
             <field name="model">product.price.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Products Price Type">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="field"/>
-                    <field name="currency_id" select="1"/>
+                <form string="Products Price Type" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="active"/>
+                        <field name="field"/>
+                        <field name="currency_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -209,29 +222,5 @@
             action="product_price_type_action" id="menu_product_price_type"
             parent="product.menu_product_pricelist_main" sequence="4" groups="base.group_no_one"/>
 
-        <!-- Moved to extra module 'sale_pricelist_type_menu':
-        <record id="product_pricelist_type_view" model="ir.ui.view">
-            <field name="name">product.pricelist.type.form</field>
-            <field name="model">product.pricelist.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Pricelist Type">
-                    <field name="name" select="1"/>
-                    <field name="key"/>
-                </form>
-            </field>
-        </record>
-        <record id="product_pricelist_type_action" model="ir.actions.act_window">
-            <field name="name">Pricelists Types</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.pricelist.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-	<menuitem
-	    action="product_pricelist_type_action" id="menu_product_pricelist_type_action2"
-	    parent="product.menu_product_pricelist_main" sequence="2"/>-->
-
     </data>
 </openerp>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 4620c8c4a2c..365cbbeb0d7 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -4,35 +4,35 @@
 
     <!--   Product Price List -->
 
-		<record id="view_product_price_list" model="ir.ui.view">
-		      <field name="name">Price per unit</field>
-		      <field name="model">product.price_list</field>
-		      <field name="type">form</field>
-		      <field name="arch" type="xml">
-				<form string="Price List">
-                    <separator colspan="4" string="Calculate Product Price per Unit Based on Pricelist Version."/>
-				    <field name="price_list" widget="selection"/>
-				    <field name="qty1" colspan="2" />
-				    <field name="qty2" colspan="2" />
-				    <field name="qty3" colspan="2" />
-				    <field name="qty4" colspan="2" />
-				    <field name="qty5" colspan="2" />
-					<separator colspan="4"/>
-                    <group col="2" colspan="4">
-                         <button icon="gtk-cancel" special="cancel" string="Close"/>
-                         <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
+        <record id="view_product_price_list" model="ir.ui.view">
+              <field name="name">Price per unit</field>
+              <field name="model">product.price_list</field>
+              <field name="type">form</field>
+              <field name="arch" type="xml">
+                <form string="Price List" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
+                    <header>
+                    <group string="Calculate Product Price per Unit Based on Pricelist Version.">
+                        <field name="price_list" widget="selection"/>
+                        <field name="qty1" colspan="2" />
+                        <field name="qty2" colspan="2" />
+                        <field name="qty3" colspan="2" />
+                        <field name="qty4" colspan="2" />
+                        <field name="qty5" colspan="2" />
                     </group>
-				</form>
-		      </field>
-    	</record>
+                </form>
+              </field>
+        </record>
 
         <act_window id="action_product_price_list"
-    		key2="client_print_multi"
+            key2="client_print_multi"
             name="Price List"
-    		res_model="product.price_list"
+            res_model="product.price_list"
             src_model="product.product"
             groups="product.group_sale_pricelist"
-    		view_mode="form" target="new" view_type="form" />
+            view_mode="form" target="new" view_type="form" />
 
 </data>
 </openerp>
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 0f901173caa..4a19996af66 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -44,9 +44,11 @@
             <field name="model">product.manufacturer.attribute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product Template Name">
-                    <field name="name"/>
-                    <field name="value"/>
+                <form string="Product Template Name" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="value"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 6c083bca6b0..60732214eef 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -21,40 +21,41 @@
             <field name="type">form</field>
             <field name="priority">50</field>
             <field name="arch" type="xml">
-                 <form string="Product Margins">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="default_code" select="1"/>
+                 <form string="Product Margins" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="default_code"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                     <page string="Margins">
-                        <separator string="Analysis Criteria" colspan="4"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <newline/>
-                        <field name="invoice_state" />
+                        <group string="Analysis Criteria"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                            <newline/>
+                            <field name="invoice_state" />
 
-                        <separator string="Sales" colspan="4"/>
-                        <field name="sale_avg_price"/>
-                        <field name="list_price" string="Catalog Price" readonly="1"/>
-                        <field name="sale_num_invoiced" />
-                        <field name="sales_gap" />
-                        <field name="turnover" />
-                        <field name="sale_expected" />
+                            <separator string="Sales" colspan="4"/>
+                            <field name="sale_avg_price"/>
+                            <field name="list_price" string="Catalog Price" readonly="1"/>
+                            <field name="sale_num_invoiced" />
+                            <field name="sales_gap" />
+                            <field name="turnover" />
+                            <field name="sale_expected" />
 
-                        <separator string="Purchases" colspan="4"/>
-                        <field name="purchase_avg_price"/>
-                        <field name="standard_price" string="Standard Price" readonly="1"/>
-                        <field name="purchase_num_invoiced" />
-                        <field name="purchase_gap" />
-                        <field name="total_cost" />
-                        <field name="normal_cost" />
+                            <separator string="Purchases" colspan="4"/>
+                            <field name="purchase_avg_price"/>
+                            <field name="standard_price" string="Standard Price" readonly="1"/>
+                            <field name="purchase_num_invoiced" />
+                            <field name="purchase_gap" />
+                            <field name="total_cost" />
+                            <field name="normal_cost" />
 
-                        <separator string="Margins" colspan="4"/>
-                        <field name="total_margin"/>
-                        <field name="expected_margin"/>
-                        <field name="total_margin_rate" widget="progressbar"/>
-                        <field name="expected_margin_rate" widget="progressbar"/>
+                            <separator string="Margins" colspan="4"/>
+                            <field name="total_margin"/>
+                            <field name="expected_margin"/>
+                            <field name="total_margin_rate" widget="progressbar"/>
+                            <field name="expected_margin_rate" widget="progressbar"/>
+                         </group>
                     </page>
                     </notebook>
                 </form>
@@ -68,8 +69,8 @@
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <tree string="Product Margins">
-                    <field name="name" select="1"/>
-                    <field name="default_code" select="1"/>
+                    <field name="name"/>
+                    <field name="default_code"/>
                     <field name="sale_avg_price"/>
                     <field name="sale_num_invoiced"/>
                     <field name="turnover" sum="Turnover"/>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 20a38148d3d..55a3f9d81cd 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-     	<record id="product_margin_form_view" model="ir.ui.view">
+         <record id="product_margin_form_view" model="ir.ui.view">
             <field name="name">product.margin.form</field>
             <field name="model">product.margin</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="General Information"/>
-					<field name="from_date" />
-					<field name="to_date" />
-					<field name="invoice_state" />
-					<separator colspan="4" string=""/>						
-					<group col="4" colspan="2">
-                		<button icon='gtk-cancel' special="cancel" string="Cancel" />
-				    	<button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
-					</group>
+                <form string="Properties categories" version="7.0">
+                    <header>
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    <header>
+                    <group col="4" string="General Information">
+                        <field name="from_date" />
+                        <field name="to_date" />
+                        <field name="invoice_state" />
+                    </group>
                 </form>
             </field>
         </record>
-  		        
-		<act_window name="Product Margins"
-			res_model="product.margin"
-			src_model="product.product"
-			view_mode="form"
-			target="new"
-			key2="client_action_multi"    
-			id="product_margin_act_window"/>	
-			       
+
+        <act_window name="Product Margins"
+            res_model="product.margin"
+            src_model="product.product"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="product_margin_act_window"/>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index a4b302f33f2..f9f9841c0dc 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -75,7 +75,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board" layout="manual">
+                <form string="My Board" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>