diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 776c663b994..bbbbb5c491f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -117,7 +117,7 @@
             <field name="inherit_id" ref="sale.view_sales_config"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <group name="contracts" position="inside">
+                <group name="config_contracts" position="inside">
                     <separator string="Contracts" colspan="4"/>
                     <field name="module_analytic_user_function"/>
                     <field name="module_analytic_journal_billing_rate"/>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 12265dbd1df..442986cff61 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -148,13 +148,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Configure Sales &amp; CRM">
-                <group name="invoice_policy" colspan="4"/>
-                <group name="sale_order" colspan="4"/>
-                <group name="contracts" colspan="4"/>
-                <group name="emails" colspan="4"/>
-                <group name="synchronization" colspan="4"/>
-                <group name="documents" colspan="4"/>
-                <group name="customer_form" colspan="4"/>
+                <group name="config_sale" colspan="4"/>
+                <group name="config_contracts" colspan="4"/>
+                <group name="config_emails" colspan="4"/>
+                <group name="config_crm" colspan="4"/>
+                <label colspan="2"/>
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
             </form>
         </field>
     </record>
@@ -164,8 +164,8 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.config.settings</field>
         <field name="view_id" ref="base.view_sale_config_settings"/>
-        <field name="view_type">form</field>
         <field name="view_mode">form</field>
+        <field name="target">new</field>
     </record>
 
   </data>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index d974b6015a2..df849f3a6da 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
-                <group name="emails" position="inside">
+                <group name="config_emails" position="inside">
                     <separator string="Emails" colspan="4"/>
                     <field name="fetchmail_crm"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_crm','=',False)]}">
@@ -21,7 +21,7 @@
                         <field name="default_password" password="True" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                     </group>
                 </group>
-                <group name="synchronization" position="inside">
+                <group name="config_crm" position="inside">
                     <separator string="Import and Synchronize data from an other application" colspan="4"/>
                     <group colspan="2" col="2">
                         <field name="module_import_sugarcrm"/>
@@ -30,12 +30,8 @@
                     <group colspan="2" col="2">
                         <field name="module_crm_caldav"/>
                     </group>
-                </group>
-                <group name="documents" position="inside">
                     <separator string="Documents and Wiki" colspan="4"/>
                     <field name="module_wiki_sale_faq" />
-                </group>
-                <group name="customer_form" position="inside">
                     <separator string="Customer Form" colspan="4"/>
                     <field name="module_base_contact"/>
                     <field name="module_google_map"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index 1cc52177f5c..2610538da42 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="emails" position="inside">
+                <group name="config_emails" position="after">
                     <separator string="Plugins" colspan="4"/>
                     <field name="module_plugin_thunderbird"/>
                     <newline/>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index b55d10af2fa..a5012c638ac 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="invoice_policy" position="inside">
+                <group name="config_sale" position="inside">
                     <separator string="Picking and Invoice Policy" colspan="4"/>
                     <group colspan="4">
                         <group colspan="2" col="2">
@@ -26,8 +26,6 @@
                             <field name="time_unit" domain="[('category_id.name','=','Working Time')]" attrs="{'invisible':[('task_work','=',False),('module_account_analytic_analysis','=',False)],'required': [('module_account_analytic_analysis','=',True)]}"/>
                         </group>
                     </group>
-                </group>
-                <group name="sale_order" position="inside">
                     <separator string="Sale Order" colspan="4"/>
                     <group colspan="2" col="2">
                         <field name="group_sale_pricelist_per_customer"/>