diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index d5e0b50d479..17852e2c82b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -169,18 +169,8 @@
                             <div name="Sale Features"/>
                         </group>
                     </div>
-                    <div name="config_sale">
-                        <field name="module_crm" invisible="1"/>
-                        <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                        <p name="config_email_integration" attrs="{'invisible': [('module_crm','=',False)]}">
-                            Odoo allows to automatically create leads (or others documents)
-                            from incoming emails. You can automatically synchronize emails with Odoo
-                            using regular POP/IMAP accounts, using a direct email integration script for your
-                            email server, or by manually pushing emails to Odoo using specific
-                            plugins for your preferred email application.
-                        </p>
-                    </div>
-                    <div name="config_other"/>
+                    <div name="config_sale"/>
+                    <div name="config_pos"/>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index bf586c8b30e..8717e53357b 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <data>
-	            <div name="config_sale" position="before">
+	            <div name="config_sale" position="inside">
 	                <separator string="Sale Services"/>
 	                <group>
                         <label for="id" string="Pre-Sale Services"/>
@@ -32,23 +31,38 @@
                             </div>
                         </div>
                     </group>
-	            </div>
-                <xpath expr="//p[@name='config_email_integration']" position="after">
-                    <group name="default_alias">
-                        <label for="id" string="Leads Email Alias"/>
-                        <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                </div>
+                <div name="config_sale" position="after">
+                    <div name="config_alias">
+                        <separator string="Emails Integration"/>
+                        <p name="config_email_integration">
+                            Odoo allows to automatically create leads
+                            from incoming emails.
+                        </p> 
+                        <group>
+                            <label for="id" string="Leads Email Alias"/>
                             <div>
-                                <field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/>
-                                @
-                                <field name="alias_domain" class="oe_inline" readonly="1"/>
+                                <div>
+                                    <span attrs="{'invisible': [('group_multi_salesteams', '!=', True)]}">
+                                        <label string="Each sales team has an email alias that can be defined on the sales team form view" class="oe_inline oe_form_label_help oe_align_right"/>
+                                    </span>
+                                    <span class="oe_inline" attrs="{'invisible': [('group_multi_salesteams', '!=', False)]}">
+                                        <label string="Automatically create new leads when an email is sent to the following alias :" class="oe_inline oe_form_label_help oe_align_right"/>
+                                        <field name="alias_prefix" class="oe_inline"/>
+                                        <span>@</span>
+                                        <field name="alias_domain"  class="oe_inline" readonly="1"/>
+                                    </span>
+                                </div>
+                                 <div attrs="{'invisible': [('alias_domain', 'not in', ['localhost', '', False])]}">
+                                    <p>
+                                        <label string="Your alias domain is not configured yet, or is still 'localhost'"/>
+                                        <button type="action" name="base_setup.action_general_configuration" string="Configure your domain alias" icon="gtk-execute" class="oe_inline oe_link"/>
+                                    </p>
+                                </div>
                             </div>
-                            <p>
-                                All emails sent to this address and processed by the mailgateway
-                                will create a new lead.
-                            </p>
-                        </div>
-                    </group>
-                </xpath>
+                        </group>
+                    </div>
+	            </div>
                 </data>
             </field>
         </record>
diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml
index 1a9f2710b1e..6b4e3a72b9e 100644
--- a/addons/crm/sales_team_view.xml
+++ b/addons/crm/sales_team_view.xml
@@ -124,27 +124,28 @@
                         <field name="use_leads"/><label for="use_leads" string="Leads"/>
                         <field name="use_opportunities" class="oe_inline"/><label for="use_opportunities"/>
                     </xpath>
-                    <xpath expr="//field[@name='change_responsible']" position="after">
-                        <label for="alias_name" string="Email Alias"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                        <div name="alias_def"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}">
-                            <field name="alias_id" class="oe_read_only oe_inline"
-                                string="Email Alias" required="0"/>
-                            <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                            </div>
-                        </div>
-                        <field name="alias_contact" class="oe_inline"
-                            string="Accept Emails From"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    </xpath>
                     <xpath expr="//page[@string='Team Members']" position="after">
                         <page string="Stages">
                             <separator string="Select Stages for this Sales Team"/>
                                 <field name="stage_ids"/>
                         </page>
                    </xpath>
+                   <xpath expr="//field[@name='change_responsible']" position="after">
+                        <group name="alias_info" string="Leads Email Alias" class="oe_inline" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <label for="alias_name" string="Email Alias"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                            <div name="alias_def"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <field name="alias_id" class="oe_read_only oe_inline"
+                                    string="Email Alias" required="0"/>
+                                <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                    <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </div>
+                            </div>
+                            <field name="alias_contact" class="oe_inline"
+                                string="Accept Emails From"/>
+                        </group>
+                   </xpath>
                 </field>
             </record>
 
diff --git a/addons/point_of_sale/res_config_view.xml b/addons/point_of_sale/res_config_view.xml
index 3f8a2c6e7f5..c339b7488a4 100644
--- a/addons/point_of_sale/res_config_view.xml
+++ b/addons/point_of_sale/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='module_crm']" position="before">
+                <xpath expr="//div[@name='config_pos']" position="inside">
                     <separator string="Point of Sale"/>
                     <group>
                     	<label for="id" string="Extensions"/>
diff --git a/addons/sale/sales_team_view.xml b/addons/sale/sales_team_view.xml
index 4cad241c5c8..3fadbccbed1 100644
--- a/addons/sale/sales_team_view.xml
+++ b/addons/sale/sales_team_view.xml
@@ -10,9 +10,11 @@
                 <xpath expr="//div[@name='options_active']" position="inside">
                     <field name="use_quotations" class="oe_inline"/><label for="use_quotations"/>
                 </xpath>
-                <xpath expr="//field[@name='code']" position="after">
-                    <field name="invoiced_target"/>
-                    <field name="invoiced_forecast"/>
+                <xpath expr="//group[@name='sales_team_more_info']" position="after">
+                    <group string="Invoicing">
+                        <field name="invoiced_target"/>
+                        <field name="invoiced_forecast"/>
+                    </group>
                 </xpath>
             </data>
             </field>
diff --git a/addons/sales_team/res_config_view.xml b/addons/sales_team/res_config_view.xml
index 88a51e78cda..983b38e64d1 100644
--- a/addons/sales_team/res_config_view.xml
+++ b/addons/sales_team/res_config_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <data>
-	            <div name="config_sale" position="before">
+	            <div name="config_sale" position="after">
                     <separator string="Sales Teams"/>
                     <group>
                         <label for="id" string="Manage Sales Teams"/>
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index d1f4f3daf05..159d70d7fc1 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -104,8 +104,6 @@
                                 <field name="active"/>
                             </group>
                             <group name="right">
-                                <field name="parent_id"/>
-                                <field name="change_responsible"/>
                             </group>
                         </group>
                         <notebook colspan="4">
@@ -129,6 +127,17 @@
                                     </kanban>
                                 </field>
                             </page>
+                            <page string="More Info" groups="base.group_sale_manager">
+                                <group name="sales_team_more_info">
+                                    <group string="Escalation">
+                                        <field name="parent_id"/>
+                                        <field name="change_responsible"/>                                
+                                    </group>
+                                    <group>
+                                        <field name="active"/>
+                                    </group>
+                                </group>                                
+                            </page>
                             <page string="Notes">
                                 <field name="note"/>
                             </page>