diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e1121e28d5f..3006de86a3d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -225,6 +225,7 @@
                     <field name="phone"/>
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
@@ -235,6 +236,7 @@
             </field>
         </record>
 
+
         <!-- CRM Lead Calendar View -->
         <record model="ir.ui.view" id="crm_case_calendar_view_leads">
             <field name="name">CRM - Leads Calendar</field>
@@ -322,24 +324,27 @@
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
-                    <field name="create_date"/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                    <separator/>
-                    <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="In Progress" name="open" domain="[('state','=','open')]"/>
-                    <separator/>
-                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads"/>
-                    <separator/>
-                    <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                    <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                     <field name="user_id"/>
-                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="create_date"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
+                    <separator/>
+                    <filter string="Open" name="open" domain="[('state','!=','cancel')]" help="Open Leads"/>
+                    <filter string="Dead" name="dead" domain="[('state','=','cancel')]"/>
+                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
+                    <filter string="Assigned to Me"
+                            domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
+                            help="Leads that are assigned to me"/>
+                    <filter string="Assigned to My Team(s)"
+                            domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                            help="Leads that are assigned to any sales teams I am member of"/>
+                    <separator/>
                     <group expand="0" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
                         <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
                         <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Referrer" domain="[]" context="{'group_by':'referred'}"/>
@@ -351,7 +356,7 @@
                         <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
                         <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                     </group>
-               </search>
+                </search>
             </field>
         </record>
 
@@ -543,14 +548,14 @@
                     <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
                     <filter string="Won" name="won" domain="[('state','=','done')]"/>
                     <filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
-                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="Unassigned Opportunities"/>
+                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
                     <filter string="Assigned to Me"
                             domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to me"/>
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Opportunities that are assigned to any sale teams I am member of"/>
+                            help="Opportunities that are assigned to any sales teams I am member of"/>
                     <separator/>
                     <group expand="0" string="Group By..." colspan="16">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>