diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 742b842684a..86343512295 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -15,92 +15,94 @@
             <field name="model">account.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Accounting">
-                    <field name="has_default_company" invisible="1" />
-                    <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
-                        attrs="{'invisible': [('has_default_company', '=', True)]}"/>
-                    <field name="expects_chart_of_accounts"/>
+                <form string="Configure Accounting" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <field name="has_default_company" invisible="1" />
+                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+                            attrs="{'invisible': [('has_default_company', '=', True)]}"/>
+                        <field name="expects_chart_of_accounts"/>
 
-                    <field name="has_chart_of_accounts" invisible="1"/>
-                    <group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <label string="Please select a chart template to install a chart of accounts." colspan="4"/>
-                        <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                        <button string="Install More Chart Templates" icon="gtk-go-forward"
-                            name="%(open_account_charts_modules)d" type="action"/>
-                        <field name ="code_digits" groups="account.group_account_user"/>
-                        <field name ="seq_journal" groups="base.group_extended"/>
-                        <newline/>
-                        <field name ="complete_tax_set" invisible="1"/>
-                        <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                        <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
-                        <field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
-                        <field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
-                    </group>
+                        <field name="has_chart_of_accounts" invisible="1"/>
+                        <group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
+                            <label string="Please select a chart template to install a chart of accounts." colspan="4"/>
+                            <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                            <button string="Install More Chart Templates" icon="gtk-go-forward"
+                                name="%(open_account_charts_modules)d" type="action"/>
+                            <field name ="code_digits" groups="account.group_account_user"/>
+                            <field name ="seq_journal" groups="base.group_extended"/>
+                            <newline/>
+                            <field name ="complete_tax_set" invisible="1"/>
+                            <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                            <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                            <field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
+                            <field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
+                        </group>
 
-                    <field name="has_fiscal_year" invisible="1"/>
-                    <group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
-                        <field name="date_start" on_change="onchange_start_date(date_start)"/>
-                        <field name="date_stop"/>
-                        <field name="period" colspan="4"/>
-                    </group>
+                        <field name="has_fiscal_year" invisible="1"/>
+                        <group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
+                            <field name="date_start" on_change="onchange_start_date(date_start)"/>
+                            <field name="date_stop"/>
+                            <field name="period" colspan="4"/>
+                        </group>
 
-                    <group colspan="4">
-                        <separator string="Accounting Configuration" colspan="4"/>
-                        <field name ="complete_tax_set" invisible="1"/>
-                        <newline/>
-                        <group colspan="2" col="2">
-                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
-                            <field name="module_account_accountant"/>
-                            <field name="module_account_asset"/>
+                        <group colspan="4">
+                            <separator string="Accounting Configuration" colspan="4"/>
+                            <field name ="complete_tax_set" invisible="1"/>
+                            <newline/>
+                            <group colspan="2" col="2">
+                                <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
+                                <field name="module_account_accountant"/>
+                                <field name="module_account_asset"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
+                                <field name="currency_id" widget="selection"/>
+                                <field name="module_account_budget"/>
+                            </group>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
-                            <field name="currency_id" widget="selection"/>
-                            <field name="module_account_budget"/>
+                            <separator string="Customer Invoices" colspan="2"/>
+                            <field name="sale_journal_id" invisible="1"/>
+                            <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                            <field name="sale_refund_journal_id" invisible="1"/>
+                            <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                            <field name="module_account_invoice_layout"/>
+                            <field name="module_account_voucher"/>
+                            <field name="module_account_followup"/>
+                            <field name="group_proforma_invoices"/>
                         </group>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Customer Invoices" colspan="2"/>
-                        <field name="sale_journal_id" invisible="1"/>
-                        <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                        <field name="sale_refund_journal_id" invisible="1"/>
-                        <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                        <field name="module_account_invoice_layout"/>
-                        <field name="module_account_voucher"/>
-                        <field name="module_account_followup"/>
-                        <field name="group_proforma_invoices"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Supplier Invoices" colspan="2"/>
-                        <field name="purchase_journal_id" invisible="1"/>
-                        <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                        <field name="purchase_refund_journal_id" invisible="1"/>
-                        <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                        <field name="module_account_payment"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Electronic Payments" colspan="2"/>
-                        <field name="paypal_account"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Bank &amp; Cash" colspan="2"/>
-                        <label string="Configure Bank Accounts :"/>
-                        <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
-                        <field name="company_footer"/>
-                        <field name="module_account_check_writing"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Analytic Accounting" colspan="2"/>
-                        <group name="analytic_accounting" colspan="2"/>
-                        <field name="module_account_analytic_plans"/>
-                        <field name="module_account_analytic_default"/>
-                    </group>
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <group colspan="2" col="2">
+                            <separator string="Supplier Invoices" colspan="2"/>
+                            <field name="purchase_journal_id" invisible="1"/>
+                            <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                            <field name="purchase_refund_journal_id" invisible="1"/>
+                            <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
+                            <field name="module_account_payment"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Electronic Payments" colspan="2"/>
+                            <field name="paypal_account"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Bank &amp; Cash" colspan="2"/>
+                            <label string="Configure Bank Accounts :"/>
+                            <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
+                            <field name="company_footer"/>
+                            <field name="module_account_check_writing"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Analytic Accounting" colspan="2"/>
+                            <group name="analytic_accounting" colspan="2"/>
+                            <field name="module_account_analytic_plans"/>
+                            <field name="module_account_analytic_default"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 07258111db1..40e88c604ef 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,12 +132,12 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form string="Configure Sales" layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                    <button string="Apply" type="object" name="execute"/>
+                    <button string="Cancel" special="cancel"/>
                 </div>
-                <sheet string="Configure Sales" layout="auto">
+                <sheet layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
 
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index f195cb1894a..ad8d5572466 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -13,49 +13,51 @@
             <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="HR Application">
-                    <separator string="Human Resources" colspan="4"/>
-                    <label string="Departments :"/>
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button name="%(view_department_form_installer)d" string="Create Your Departments"
-                            type="action" icon="terp-personal+"/>
-                    </group>
-                    <newline/>
-                    <label string="Employees :" />
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
-                            type="action" icon="terp-personal"/>
-                    </group>
-                    <newline/>
-                    <field name="module_hr_timesheet_sheet"/>
-                    <newline/>
-                    <field name="module_hr_holidays"/>
-                    <newline/>
-                    <label string="Salary Rules :"/>
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button string="Configure Your Salary Rules" icon="gtk-go-forward"
-                            name="%(open_payroll1_modules)d" type="action" />
-                    </group>
+                <form string ="Configure Human Resources" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Human Resources" colspan="4"/>
+                        <label string="Departments :"/>
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button name="%(view_department_form_installer)d" string="Create Your Departments"
+                                type="action" icon="terp-personal+"/>
+                        </group>
+                        <newline/>
+                        <label string="Employees :" />
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
+                                type="action" icon="terp-personal"/>
+                        </group>
+                        <newline/>
+                        <field name="module_hr_timesheet_sheet"/>
+                        <newline/>
+                        <field name="module_hr_holidays"/>
+                        <newline/>
+                        <label string="Salary Rules :"/>
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button string="Configure Your Salary Rules" icon="gtk-go-forward"
+                                name="%(open_payroll1_modules)d" type="action" />
+                        </group>
 
-                    <separator string="Additional Features" colspan="4"/>
-                    <field name="module_hr_expense"/>
-                    <newline/>
-                    <field name="module_hr_recruitment"/>
-                    <newline/>
-                    <field name="module_hr_evaluation"/>
-                    <newline/>
-                    <field name="module_hr_contract"/>
+                        <separator string="Additional Features" colspan="4"/>
+                        <field name="module_hr_expense"/>
+                        <newline/>
+                        <field name="module_hr_recruitment"/>
+                        <newline/>
+                        <field name="module_hr_evaluation"/>
+                        <newline/>
+                        <field name="module_hr_contract"/>
 
-                    <group name="config_timesheets" colspan="4"/>
-                    <group name="config_payroll" colspan="4"/>
-                    <group name="config_recruitment" colspan="4"/>
-
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <group name="config_timesheets" colspan="4"/>
+                        <group name="config_payroll" colspan="4"/>
+                        <group name="config_recruitment" colspan="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 2586f4763e2..66b8e735ed6 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -6,24 +6,25 @@
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing">
-                    <separator string="Manufacturing Order" colspan="4"/>
-                    <field name="module_mrp_operations"/>
-                    <field name="module_stock_planning"/>
-                    <field name="module_mrp_subproduct"/>
-                    <field name="module_mrp_repair"/>
+                <form string="Configure Manufacturing" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Manufacturing Order" colspan="4"/>
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
 
-		            <separator string="Logistics" colspan="4"/>
-                    <field name="module_mrp_jit"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="module_mrp_jit"/>
 
-		            <separator string="Bill Of Material" colspan="4"/>
-                    <field name="group_mrp_routings"/>
-                    <field name="group_mrp_properties"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Bill Of Material" colspan="4"/>
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index daa5bc10d8e..021bab3962c 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,24 +7,25 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project">
-                    <separator string="Project" colspan="4"/>
-                    <field name="module_project_mrp"/>
-                    <field name="module_project_timesheet"/>
-                    <field name="module_pad"/>
+                <form string="Configure Project" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Project" colspan="4"/>
+                        <field name="module_project_mrp"/>
+                        <field name="module_project_timesheet"/>
+                        <field name="module_pad"/>
 
-                    <separator string="Planning" colspan="4"/>
-                    <field name="module_project_long_term"/>
+                        <separator string="Planning" colspan="4"/>
+                        <field name="module_project_long_term"/>
 
-                    <separator string="Helpdesk and support" colspan="4"/>
-                    <field name="module_project_issue"/>
-                    <field name="module_project_issue_sheet"/>
-                    <group name="support" colspan="4"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Helpdesk and support" colspan="4"/>
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                        <group name="support" colspan="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index dcf9f921dbb..26d40ac0be0 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -6,25 +6,26 @@
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases">
-                    <separator string="Invoicing" colspan="4"/>
-                    <field name="default_invoice_method" />
+                <form string="Configure Purchases" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Invoicing" colspan="4"/>
+                        <field name="default_invoice_method" />
 
-                    <separator string="Purchase Order" colspan="4"/>
-                    <field name="group_purchase_pricelist"/>
-                    <field name="group_uom"/>
-                    <field name="module_purchase_double_validation"/>
-                    <field name="module_purchase_requisition"/>
-                    <field name="module_warning"/>
-                    <field name="module_purchase_analytic_plans"/>
+                        <separator string="Purchase Order" colspan="4"/>
+                        <field name="group_purchase_pricelist"/>
+                        <field name="group_uom"/>
+                        <field name="module_purchase_double_validation"/>
+                        <field name="module_purchase_requisition"/>
+                        <field name="module_warning"/>
+                        <field name="module_purchase_analytic_plans"/>
 
-                    <separator string="Products" colspan="4"/>
-                    <field name="module_product_manufacturer"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="module_product_manufacturer"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index aa31c4adf9d..0e43f2ad8bf 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -7,33 +7,34 @@
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Configure Warehouse">
-                    <separator string="Traceability" colspan="4"/>
-                    <field name="group_stock_production_lot"/>
-                    <field name="module_product_expiry"
-                        attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
-                    <newline/>
-                    <field name="group_stock_tracking_lot"/>
+                <form string ="Configure Warehouse" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Traceability" colspan="4"/>
+                        <field name="group_stock_production_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
+                        <newline/>
+                        <field name="group_stock_tracking_lot"/>
 
-                    <separator string="Logistics" colspan="4"/>
-                    <field name="group_stock_multiple_locations"/>
-                    <field name="module_stock_no_autopicking"/>
-                    <field name="module_stock_location"/>
-                    <field name="module_stock_invoice_directly"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="group_stock_multiple_locations"/>
+                        <field name="module_stock_no_autopicking"/>
+                        <field name="module_stock_location"/>
+                        <field name="module_stock_invoice_directly"/>
 
-                    <separator string="Products" colspan="4"/>
-                    <field name="group_stock_packaging"/>
-                    <field name="group_stock_inventory_valuation"/>
-                    <field name="group_uom"/>
-                    <field name="group_uos"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="group_stock_packaging"/>
+                        <field name="group_stock_inventory_valuation"/>
+                        <field name="group_uom"/>
+                        <field name="group_uos"/>
 
-                    <separator string="Partners" colspan="4"/>
-                    <field name="module_claim_from_delivery"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Partners" colspan="4"/>
+                        <field name="module_claim_from_delivery"/>
+                    </sheet>
                 </form>
             </field>
         </record>