diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index a9c0d6a48bb..768c0147020 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -65,7 +65,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual" version="7.0">
+                <form string="Sales Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
                             <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
@@ -156,7 +156,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statistics Dashboard" layout="manual" version="7.0">
+                <form string="Statistics Dashboard" version="7.0">
                     <board style="1-1">
                         <column>
                             <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index d56a91f6146..6477234ce05 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -88,7 +88,7 @@
             <field name="model">crm.claim</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0997cbfc87b..1239dff85ff 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,7 +28,7 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual" version="7.0">
+                <form version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 287a6c296e8..635a74052e9 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -6,7 +6,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board" layout="manual" version="7.0">
+                <form string="Document board" version="7.0">
                      <board style="2-1" >
                         <column>
                             <action string="New Files"
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 4f6e3a37b08..6bdea66e45e 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -39,7 +39,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Association Dashboard" layout="manual" version="7.0">
+                <form string="Association Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
                             <action string="Next Events"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1ec3c1cfac7..01b41833a65 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,7 +52,7 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Events" layout="manual">
+            <form string="Events" version="7.0">
                 <header>
                     <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
                     <button string="Event Ended" name="button_done" states="confirm" type="object"/>
@@ -60,7 +60,7 @@
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
-                <sheet layout="manual">
+                <sheet>
 
                 <div class="oe_right" style="height: 200px"></div>
                 <div class="oe_form_title">
@@ -353,7 +353,7 @@
             <field name="model">event.registration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="registration_open" string="Confirm" states="draft" type="object"/>
                     <button name="button_reg_close" string="Attended" states="open" type="object"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5576025b7dd..8ab02b528c5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,7 +63,7 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form layout="manual" version="7.0">
+                <form version="7.0">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index d1debeaf562..8f3c5cca7e7 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Knowledge" layout="manual">
+                <form string="Configure Knowledge">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 0a88c718f8a..5cd0839d800 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -133,7 +133,7 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual" version="7.0">
+            <form version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Close" states="running"/>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 49ec0f44909..9dd5d1afb0e 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing board" layout="manual" version="7.0">
+                <form string="Manufacturing board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 26b833a8202..be54110d641 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing" layout="manual" version="7.0">
+                <form string="Configure Manufacturing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f9f9841c0dc..df35534659d 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" version="7.0">
+                <form string="My Board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 57ff8d1a208..ef64371fb9d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,7 +18,7 @@
             <field name="model">project.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project" layout="manual" version="7.0">
+                <form string="Project" version="7.0">
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 4bd3854e0c9..495a1efe3c1 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,7 +56,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issues Dashboard" layout="manual" version="7.0">
+                <form string="Issues Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 256ca4648a9..b0d14ba2971 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -63,7 +63,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual" version="7.0">
+                <form string="Sales Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 97f1028b59f..2d77d6c661a 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -81,7 +81,7 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="action_validate" string="Approve" states="draft" type="object" />
                     <field name="state" widget="statusbar"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 82540d702b2..09b31304687 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1056,7 +1056,7 @@
             <field name="model">survey.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
                     <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>