diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 61b8f7476e8..8fb8499aa6c 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -56,23 +56,30 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                            <group name="config_sale" col="1">
-                                <field name="module_crm" invisible="1"/>
-                                <separator string="Emails Integration" col="1" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <div style="color:grey" attrs="{'invisible': [('module_crm','=',False)]}">The email integration allows ypu to autometically create leads or others documents from an incoming emails account.
-                                    Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.</div>
-                                <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}"><label for="id" string="On Mail Client"/>
-                                <div>
-                                    <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"><field name="module_plugin_thunderbird"/>
-                                    <label for="module_plugin_thunderbird" string="Thunderbird"/>plugin</div>
-                                    <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"><field name="module_plugin_outlook" class="oe_inline"/>
-                                    <label for="module_plugin_outlook" string="Outlook"/>plugin</div>
+                    <group name="config_sale" col="1">
+                        <field name="module_crm" invisible="1"/>
+                        <separator string="Emails Integration" col="1" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <div style="color:grey" attrs="{'invisible': [('module_crm','=',False)]}">
+                            The email integration allows ypu to autometically create leads or others documents from an incoming emails account.
+                            Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.
+                        </div>
+                        <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <label for="id" string="On Mail Client"/>
+                            <div>
+                                <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline">
+                                    <field name="module_plugin_thunderbird"/>
+                                    <label for="module_plugin_thunderbird"/>
                                 </div>
-                                </group>
-                            </group>
-                            <group name="config_other" col="1">
-                            </group>
-                        
+                                <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}">
+                                    <field name="module_plugin_outlook" class="oe_inline"/>
+                                    <label for="module_plugin_outlook"/>
+                                </div>
+                            </div>
+                        </group>
+                    </group>
+                    <group name="config_other" col="1">
+                    </group>
+                    
                 </form>
             </field>
         </record>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index fc8ac57cb73..6f9d67fd4aa 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -10,44 +10,57 @@
             <field name="arch" type="xml">
                 <group name="On Mail Client" version="7.0" position="after">
                     <group>
-                    <label for="id" string="On Mail Server"/>
-                    <div>
-                        <div name="fetchmail_lead"><field name="fetchmail_lead" class="oe_inline"/>
-                        Create<label for="fetchmail_lead" string="Leads"/>from Incoming Mails
-                        <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
+                        <label for="id" string="On Mail Server"/>
+                        <div>
+                            <div name="fetchmail_lead">
+                                <field name="fetchmail_lead" class="oe_inline"/>
+                                <label for="fetchmail_lead"/>
+                                <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
+                                attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
+                            </div>
                         </div>
-                    </div>
                     </group>
                 </group>
                 <group name="config_other" version="7.0" position="inside">
                     <separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
                     <group>
-                    <label for="id" string="Import From"/>
-                    <div>
-                        <div><field name="module_import_sugarcrm"/>SugarCRM</div>
-                    </div>
+                        <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>
-                    <div><field name="module_import_google"/>
-                    <label for="module_import_google" string="Google"/>(Contact and Calendar)</div>
-                    <div><field name="module_crm_caldav"/>
-                    Application with<label for="module_crm_caldav" string="Caldav"/>Protocol</div>
-                    </div>
+                        <label for="id" string="Synchronize with"/>
+                        <div>
+                            <div>
+                                <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>
                     <separator string="Customer Form"/>
                     <div>
-                        <div><field name="module_google_map"/>Add Google Maps on Customer</div>
+                        <div>
+                            <field name="module_google_map" class="oe_inline"/>
+                            <label for="module_google_map"/>
+                        </div>
                     </div>
                 </group>
                 <group name="config_sale" position="inside">
                     <separator string="Documents and Wiki" colspan="2"/>
+                    <div>
                         <div>
-                            <div><field name="module_wiki_sale_faq"/>
-                            Share Information with<label for="module_wiki_sale_faq" string="Sales FAQ"/></div>
+                            <field name="module_wiki_sale_faq"/>
+                            <label for="module_wiki_sale_faq"/>
                         </div>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index e0ca00103dc..9a52c7dce27 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,11 +9,13 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-               <div name="fetchmail_lead" position="after">
-                        <div><field name="fetchmail_claim" class="oe_inline"/>
-                        Create<label for="fetchmail_claim" string="Claims"/>from Incoming Mails
-                        <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/></div>
+                <div name="fetchmail_lead" position="after">
+                    <div>
+                        <field name="fetchmail_claim" class="oe_inline"/>
+                        <label for="fetchmail_claim"/>
+                        <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward" 
+                            attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/>
+                    </div>
                 </div>
             </field>
         </record>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 2853813f754..6410ddda09c 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -50,10 +50,12 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div name="module_plugin_outlook" version="7.0" position="replace">
-                        <div><field name="module_plugin_outlook" class="oe_inline"/>
-                        <label for="module_plugin_outlook" string="Outlook"/>plugin
+                    <div>
+                        <field name="module_plugin_outlook" class="oe_inline"/>
+                        <label for="module_plugin_outlook"/>
                         <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
-                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/></div>
+                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/>
+                    </div>
                 </div>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 4158b2c270b..7a323ce33f5 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -56,10 +56,12 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div name="module_plugin_thunderbird" version="7.0" position="replace">
-                        <div><field name="module_plugin_thunderbird" class="oe_inline"/>
-                        <label for="module_plugin_thunderbird" string="Thunderbird"/>plugin
+                    <div>
+                        <field name="module_plugin_thunderbird" class="oe_inline"/>
+                        <label for="module_plugin_thunderbird"/>
                         <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
-                            attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/></div>
+                            attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/>
+                    </div>
                 </div>
             </field>
         </record>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 2db5d694fc6..1af1fe1c3e8 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -10,84 +10,119 @@
             <field name="arch" type="xml">
                 <group name="config_sale" position="before">
                     <div>
-                    <separator string="Invoicing Process"/>
-                    <group>
-                        <label for="id" string="Invoicing Process"/>
-                        <div>
-                            <div><field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                            Genrate Invoices<label for="group_invoice_so_lines" string="Based On The Sale Order"/></div>
-                            <div><field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                            Genrate Invoices After and<label for="group_invoice_deli_orders" string="Based on Delivery Orders"/></div>
-                            <div><field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
-                            Prepare Invoices<label for="task_work" string="Based On Task's Activities"/></div>
-                            <div><field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
-                            Prepare Invoices<label for="timesheet" string="Based On Timesheets"/></div>
-                        </div>    
-                    </group> 
-                    <group>
-                        <label for="id" string="Default Process"/>
-                        <div>
-                            <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
-                                The<label for="default_order_policy" string="Default"/>Invocing method is
-                                <field name="default_order_policy" class="oe_inline"/>
+                        <separator string="Invoicing Process"/>
+                        <group>
+                            <label for="id" string="Invoicing Process"/>
+                            <div>
+                                <div>
+                                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
+                                    <label for="group_invoice_so_lines"/>
+                                </div>
+                                <div>
+                                    <field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                                    <label for="group_invoice_deli_orders"/>
+                                </div>
+                                <div>
+                                    <field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
+                                    <label for="task_work"/>
+                                </div>
+                                <div>
+                                    <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
+                                    <label for="timesheet"/>
+                                </div>
+                            </div>    
+                        </group> 
+                        <group>
+                            <label for="id" string="Default Process"/>
+                            <div>
+                                <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
+                                    <label for="default_order_policy"/>
+                                    <field name="default_order_policy" class="oe_inline"/>
+                                </div>
+                                <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}">
+                                    <field name="module_delivery" class="oe_inline"/>
+                                    <label for="module_delivery"/>
+                                </div>
+                                <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
+                                    <label for="time_unit"/>
+                                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
+                                </div>
                             </div>
-                            <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"><field name="module_delivery" class="oe_inline"/>
-                            Allow Adding Shipping Costs</div>
-                            <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
-                                The Default<label for="time_unit" string="Working Time Unit"/>For Service is
-                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
+                        </group>
                     </div>
-                
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
                     <separator string="Quotations and Sales Orders" col="1"/>
                     <group>
                         <label for="id" string="Customer Features"/>
                         <div>
-                            <div><field name="group_sale_delivery_address" class="oe_inline"/>
-                            Allow a<label for="group_sale_delivery_address" string="Different Address"/>For Delivery and Invoicing</div>
-                            <div><field name="group_sale_pricelist" class="oe_inline"/>
-                            <label for="group_sale_pricelist" string="Use Pricelists"/>to Adapt your Price Per Customers</div>
-                            <div><field name="module_sale_journal" class="oe_inline"/>
-                            Allow Batch<label for="module_sale_journal" string="Invoicing through Journals"/></div>
-                            <div name="module_warning"><field name="module_warning" class="oe_inline"/>
-                            Allow Configuring<label for="module_warning" string="alert"/>by Customer or Products</div>
+                            <div>
+                                <field name="group_sale_delivery_address" class="oe_inline"/>
+                                <label for="group_sale_delivery_address"/>
+                            </div>
+                            <div>
+                                <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>
                     <group>
                         <label for="id" string="Product Features"/>
                         <div>
-                            <div><field name="group_uom" class="oe_inline"/>
-                            Allow Different<label for="group_uom" string="Units of Measure"/></div>
-                            <div><field name="group_discount_per_so_line" class="oe_inline"/>
-                            Allow Setting a<label for="group_discount_per_so_line" string="discount"/>on the Sale Order Lines</div>
-                            <div>What's the decimal precision on prices:
-                            <field name="decimal_precision" class="oe_inline"/></div>
+                            <div>
+                                <field name="group_uom" class="oe_inline"/>
+                                <label for="group_uom"/>
+                            </div>
+                            <div>
+                                <field name="group_discount_per_so_line" class="oe_inline"/>
+                                <label for="group_discount_per_so_line"/>
+                            </div>
+                            <div>
+                                <label for="decimal_precision"/>
+                                <field name="decimal_precision" class="oe_inline"/>
+                            </div>
                         </div>
                     </group>
                     <group>
                         <label for="id" string="Sale Features"/>
                         <div>
-                            <div><field name="group_multiple_shops" class="oe_inline"/>
-                            Manage<label for="group_multiple_shops" string="Multiple Shops"/></div>
-                            <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"><field name="default_picking_policy" class="oe_inline"/>
-                            Configure Per Order if yoy<label for="default_picking_policy" string="Deliver in One Pack or each Product"/>when Available</div>
-                            <div name="module_sale_margin"><field name="module_sale_margin" class="oe_inline"/>
-                            <label for="module_sale_margin" string="Display Margins"/>on Sale Orders</div>
+                            <div>
+                                <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"/>
+                            </div>
                         </div>
                     </group>
                     <separator string="Contracts Management" colspan="2"/>
-                    <div style="color:grey">Use contract to be able to manage your services with multiple invoicing as part of the same contract with your customer</div>
+                    <div style="color:grey">
+                        Use contract to be able to manage your services with multiple invoicing as part of the same contract with your customer
+                    </div>
                     <group>
                         <label for="id" string="Contract Feature"/>
                         <div>
-                            <div><field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
-                            Use Contract Management</div>
-                            <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"><field name="module_analytic_user_function" class="oe_inline"/>
-                            Assign User Roles per Contract</div>
+                            <div>
+                                <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
+                                <label for="module_account_analytic_analysis"/>
+                            </div>
+                            <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
+                                <field name="module_analytic_user_function" class="oe_inline"/>
+                                <label for="module_analytic_user_function"/>
+                            </div>
                         </div>
                     </group>
                 </group>