diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..6e6ecacb719 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -17,7 +17,7 @@
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" />
                 </header>
-                <sheet string="Fiscalyear" layout="auto">
+                <sheet string="Fiscalyear" >
                     <group>
                         <group>
                             <field name="name"/>
@@ -1272,7 +1272,7 @@
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar"/>
                 </header>
-                <sheet string="Journal Entries" layout="auto">
+                <sheet string="Journal Entries" >
                     <group col="4">
                         <field name="name" readonly="True"/>
                         <field name="ref"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..a9ba1d02d71 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -112,7 +112,7 @@
                     <button name="cancel" states="draft,open" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
-                <sheet string="Payment order" layout="auto">
+                <sheet string="Payment order" >
                     <group col="4">
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index e5919d9089e..710a065c341 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -87,7 +87,7 @@
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
-                <sheet string="Sales Receipt" layout="auto">
+                <sheet string="Sales Receipt" >
                     <div class="oe_title">
                         <label for="number" class="oe_edit_only"/>
                         <h1><field name="number" readonly="0" /></h1>
diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml
index 7a517c36ed7..e8c0de95513 100644
--- a/addons/board/board_mydashboard_view.xml
+++ b/addons/board/board_mydashboard_view.xml
@@ -7,7 +7,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Dashboard" layout="manual"  version="7.0">
+                <form string="My Dashboard"   version="7.0">
                     <board style="2-1">
                         <column>
                         </column>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index de4219fb42d..7cfedb40838 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule/Log a Call" layout="manual" version="7.0">
+                <form string="Schedule/Log a Call"  version="7.0">
                     <header>
                         <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
                         <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7e694ffd21b..a87835aa261 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -107,7 +107,7 @@
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
-                <sheet string="Claims" layout="auto">
+                <sheet string="Claims" >
                     <group>
                         <field name="name" />
                         <field name="date"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index dfe58162d83..b3284dce889 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -71,7 +71,7 @@
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-                <sheet string="Funds Form" layout="auto">
+                <sheet string="Funds Form" >
                     <group col="4">
                         <field name="name" string="Name"/>
                         <field name="section_id" colspan="1" widget="selection"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 2a004b32d3e..a5fe6c251a5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -44,7 +44,7 @@
                             states="draft,open,pending"/>
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-                <sheet string="Helpdesk Support" layout="auto">
+                <sheet string="Helpdesk Support" >
                     <group col="4" class="oe_header">
                         <field name="name" string="Query"/>
                         <field name="section_id" widget="selection"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7633717edc3..56a9a2fd75f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -362,7 +362,7 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state"  nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-                <sheet string="Registration" layout="auto">
+                <sheet string="Registration" >
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
                         <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 6c40edd8d1e..e7d429877f7 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -7,7 +7,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Human Resources Dashboard" layout="manual" version="7.0">
+            <form string="Human Resources Dashboard"  version="7.0">
                 <board style="2-1">
                     <column/>
                     <column/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7db5a41b7e8..7aa830cc7f1 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -67,7 +67,7 @@
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
-                <sheet string="Leave Request" layout="auto">
+                <sheet string="Leave Request" >
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b10c57e4169..63a4387bef4 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -141,7 +141,7 @@
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
-            <sheet string="Segments" layout="auto">
+            <sheet string="Segments" >
                 <group>
                     <group string="Segment">
                         <field name="name"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index fe88f61bd98..b4113311a3d 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -156,7 +156,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
-                <sheet layout="auto">
+                <sheet >
                     <group colspan="4" col="6">
                         <field name="name"/>
                         <field name="process_id"/>
@@ -258,7 +258,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition" version="7.0">
-                <sheet layout="auto">
+                <sheet >
                     <group col="4">
                         <field name="name"/>
                         <field name="source_node_id"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f02c4648c15..4284d60879e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -66,7 +66,7 @@
             <field name="type">form</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Product" layout="auto" version="7.0">
+                <form string="Product"  version="7.0">
                     <sheet>
                         <field name="product_image" widget="image" class="oe_avatar oe_right" />
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 97b051426f8..c12ed792bd5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,7 +38,7 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" layout="auto">
+                <sheet string="Project" >
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 807455a74ad..0b27a690e85 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -87,7 +87,7 @@
                     <button name="action_validate" string="Approve" states="draft" type="object" />
                     <field name="state" widget="statusbar"/>
                 </header>
-                <sheet string="Stock and Sales Forecast" layout="auto">
+                <sheet string="Stock and Sales Forecast" >
                     <group colspan = "4" col = "4" class="oe_header">
                         <group colspan = "2" col="2" >
                             <field name="company_id" 
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 02cef734f33..9c389156676 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1068,7 +1068,7 @@
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </header>
-                <sheet string="Survey Request" layout="auto">
+                <sheet string="Survey Request" >
                     <group class="oe_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>