diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index c4e8b75f0d7..76191379258 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -23,15 +23,6 @@
                 </group>
                 <div name="config_other" version="7.0" position="inside">
                     <separator string="Import and Synchronize Data from an Other Application"/>
-                    <group>
-                        <label for="id" string="Import From"/>
-                        <div>
-                            <div>
-                                <field name="module_import_sugarcrm"/>
-                                <label for="module_import_sugarcrm"/>
-                            </div>
-                        </div>
-                    </group>
                     <group>
                         <label for="id" string="Synchronize with"/>
                         <div>
@@ -39,10 +30,6 @@
                                 <field name="module_import_google"/>
                                 <label for="module_import_google"/>
                             </div>
-                            <div>
-                                <field name="module_crm_caldav"/>
-                                <label for="module_crm_caldav"/>
-                            </div>
                         </div>
                     </group>
                 </div>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index aaf5a4dea39..e5818bf9fcb 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -65,10 +65,6 @@
                     <group name="timesheet_grp">
                         <label for="id" string="Time Tracking"/>
                         <div>
-                            <div>
-                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
-                                <label for="module_hr_attendance"/>
-                            </div>
                             <div>
                                 <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
                                 <label for="module_hr_timesheet"/>
@@ -77,6 +73,10 @@
                                 <field name="module_hr_timesheet_sheet" class="oe_inline"/>
                                 <label for="module_hr_timesheet_sheet"/>
                             </div>
+                            <div>
+                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
+                                <label for="module_hr_attendance"/>
+                            </div>
                         </div>
                     </group>
                     <group name="recruitment_grp">
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index a5364524747..a759fa9c8bf 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -22,7 +22,7 @@
                                 <field name="module_marketing_campaign" class="oe_inline"/>
                                 <label for="module_marketing_campaign"/>
                             </div>
-                            <div>
+                            <div attrs="{'invisible':[('module_marketing_campaign','=',False)]}">
                                 <field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
                                 <label for="module_marketing_campaign_crm_demo"/>
                             </div>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 668b8874607..4acbfaa49c4 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -43,7 +43,7 @@ class purchase_config_settings(osv.osv_memory):
         'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
-        'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
+        'module_purchase_analytic_plans': fields.boolean('allow using multiple analytic accounts on the same order',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index eb51b20996c..2749314c0c9 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -86,11 +86,11 @@ class sale_configuration(osv.osv_memory):
             help="""This adds the 'Margin' on sales order.
                 This gives the profitability by calculating the difference between the Unit Price and Cost Price.
                 This installs the module sale_margin."""),
-        'module_sale_journal': fields.boolean("allow batch invoicing through journals",
+        'module_sale_journal': fields.boolean("allow batch invoicing of delivery orders through journals",
             help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
                 and perform batch operations on journals.
                 This installs the module sale_journal."""),
-        'module_analytic_user_function': fields.boolean("assign user roles per contract",
+        'module_analytic_user_function': fields.boolean("one employee can have different roles per contract",
             help="""Allows you to define what is the default function of a specific user on a given account.
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index c827adac4ce..37dcd47b7fd 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -60,15 +60,30 @@
                         <field name="group_sale_pricelist" class="oe_inline"/>
                         <label for="group_sale_pricelist"/>
                     </div>
-                    <div>
-                        <field name="module_sale_journal" class="oe_inline"/>
-                        <label for="module_sale_journal"/>
-                    </div>
                     <div name="module_warning">
                         <field name="module_warning" class="oe_inline"/>
                         <label for="module_warning"/>
                     </div>
                 </div>
+                <group name="Sale" position="before">
+                    <group>
+                        <label for="id" string="Warehouse Features"/>
+                        <div>
+                            <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
+                                <field name="default_picking_policy" class="oe_inline"/>
+                                <label for="default_picking_policy"/>
+                            </div>
+                            <div>
+                                <field name="group_mrp_properties" class="oe_inline"/>
+                                <label for="group_mrp_properties"/>
+                            </div>
+                            <div>
+                                <field name="module_sale_journal" class="oe_inline"/>
+                                <label for="module_sale_journal"/>
+                            </div>
+                        </div>
+                    </group>
+                </group>
                 <group name="Sale" position="before">
                     <group>
                         <label for="id" string="Product Features"/>
@@ -81,10 +96,6 @@
                                 <field name="group_discount_per_so_line" class="oe_inline"/>
                                 <label for="group_discount_per_so_line"/>
                             </div>
-                            <div>
-                                <field name="group_mrp_properties" class="oe_inline"/>
-                                <label for="group_mrp_properties"/>
-                            </div>
                             <div>
                                 <label for="decimal_precision"/>
                                 <field name="decimal_precision" class="oe_inline"/>
@@ -97,10 +108,6 @@
                         <field name="group_multiple_shops" class="oe_inline"/>
                         <label for="group_multiple_shops"/>
                     </div>
-                    <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
-                        <field name="default_picking_policy" class="oe_inline"/>
-                        <label for="default_picking_policy"/>
-                    </div>
                     <div name="module_sale_margin">
                         <field name="module_sale_margin" class="oe_inline"/>
                         <label for="module_sale_margin"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 5a7c9a150f8..321a2498126 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -63,9 +63,10 @@
                 <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
-                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/> - 
                         <button name="%(action_view_change_standard_price)d" string="Update"
-                            type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
+                            type="action" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
+                            class="oe_link"/>
                     </div>
                 </field>
             </field>