diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2b7760c1716..7feb379c1a7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name"/>
+                    <field name="name" string="Stage Name" filter_domain="[('name','ilike',self)]"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -53,25 +53,6 @@
         <!--
             LEADS
             -->
-        <act_window
-                id="act_crm_opportunity_crm_phonecall_new"
-                name="Phone calls"
-                groups="base.group_sale_salesman"
-                res_model="crm.phonecall"
-                view_mode="tree,calendar,form"
-                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-                domain="[('opportunity_id', '=', active_id)]"
-                view_type="form"/>
-
-        <act_window
-                id="act_crm_opportunity_crm_meeting_new"
-                name="Meetings"
-                res_model="crm.meeting"
-                view_mode="tree,form,calendar"
-                context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-                domain="[('opportunity_id', '=', active_id)]"
-                view_type="form"/>
-
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -93,16 +74,6 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
-                    <div class="oe_right oe_form_button_box" name="buttons">
-                        <button type="action"
-                            name="%(act_crm_opportunity_crm_meeting_new)d"
-                            string="Meetings" />
-
-                        <button type="action"
-                            name="%(act_crm_opportunity_crm_phonecall_new)d"
-                            string="Phone Calls" />
-                    </div>
-
                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <group>
@@ -249,9 +220,10 @@
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
-                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
+                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
                                 <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                 <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
@@ -310,6 +282,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
+                <field name="name" string="Lead / Customer"
+                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self),('subjects','ilike',self)]"/>
+                <separator orientation="vertical"/>
+                <field name="create_date"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
@@ -322,8 +299,6 @@
                     string="Pending"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-
-                <separator orientation="vertical"/>
                 <filter string="Unassigned Leads"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
@@ -334,23 +309,11 @@
                         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"/>
                 <separator orientation="vertical"/>
-                <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id"/>
-                <field name="subjects"/>
                 <field name="section_id" widget="selection"
                     context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <separator orientation="vertical"/>
-                <field name="country_id" context="{'invisible_country': False}">
-                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                </field>
-                <field name="create_date"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
@@ -368,6 +331,15 @@
                     <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
+                <separator orientation="vertical"/>
+                <group string="Display">
+                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>           
            </search>
         </field>
     </record>
@@ -386,10 +358,6 @@
         <field name="arch" type="xml">
             <form string="Opportunities" version="7.0">
                 <header>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
                     <button name="case_open" string="Open" type="object"
@@ -402,6 +370,10 @@
                             states="done,cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
@@ -560,6 +532,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
                     name="new"
@@ -572,7 +547,6 @@
                     string="Pending"  help="Pending Opportunities"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
                 <filter string="Unassigned Opportunities"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
@@ -582,20 +556,12 @@
                         context="{'invisible_section': False}"
                         help="Opportunities that are assigned to either me or one of the sale teams I manage" />
                 <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                 <field name="user_id"/>
                 <field name="country"/>
                 <field name="partner_id"/>
                 <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
-                <newline/>
+                    context="{'invisible_section': False, 'default_section_id': self}"/>
+                <separator orientation="vertical"/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
@@ -611,6 +577,13 @@
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
+                <group string="Display">
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 962216a222f..3784c81e353 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,62 +38,52 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                    <div class="oe_form_title">
-                        <div class="oe_form_readonly_hidden">
-                            <label for="name" string="Title"/> 
-                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
-                            <label for="allday" string="All Day?"/>)
-                        </div>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                        <h2>
-                            At <field name="location" class="oe_form_inline" />
-                        </h2>
-                    </div>
-                    <h2>
-                        <label for="duration" string="Duration" />
-                        <field name="duration" widget="float_time"
-                            on_change="onchange_dates(date,duration,False,allday)"
-                            class="oe_form_inline"/> from
-                        <field name="date"
-                            string="Start Date" 
-                            required="1"
-                            class="oe_form_readonly_hidden oe_form_inline"/> to
-                        <field name="date_deadline" 
-                            string="End Date" required="1"
-                            on_change="onchange_dates(date,False,date_deadline)"                            
-                            class="oe_form_inline"/> 
-                    </h2>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="organizer"/>
-                        <field name="section_id" widget="selection"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
-                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
+                <group col="6" colspan="4">
+                    <field name="name" string="Title"
+                           required="1" />
+                    <field name="categ_id" widget="selection"
+                        string="Meeting Type"
+                        domain="[('object_id.model', '=', 'crm.meeting')]" />
+                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
+                    <newline/>
+                    <field name="date" string="Start Date" required="1"
+                        on_change="onchange_dates(date,duration,False,allday)" />
+                    <field name="duration" widget="float_time"
+                        on_change="onchange_dates(date,duration,False,allday)" />
+                    <field name="date_deadline" string="End Date" required="1"
+                        on_change="onchange_dates(date,False,date_deadline)" />
+                    <field name="location" />
+                    <field name="alarm_id" string="Reminder"
+                        widget="selection" />
+                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                           <field name="recurrency" string="Recurrence"/>
                     </group>
                 </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
+                <page string="Meeting">
+                    <group col="6" colspan="4">
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Assignment"/>
+                            <field name="user_id" />
+                            <field name="organizer"/>
+                            <field name="section_id" widget="selection"/>
+                        </group><group col="2" colspan="2">
+                            <separator colspan="2" string="Contacts"/>
+                            <field name="partner_id" string="Partner"
+                                on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
+                        </group><group col="2" colspan="2">
+                            <separator colspan="2" string="Visibility"/>
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as" string="Show Time as"/>
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                    </group>
+                    <separator string="Description" colspan="4" />
+                    <field name="description" nolabel="1" colspan="4" />
+                    </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@@ -167,11 +157,12 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
+                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string=" Recurrence Pattern" />
                                 <field name="interval" />
+                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
@@ -218,9 +209,9 @@
                     </page>
                 </notebook>
                 </sheet>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
+                <div class="oe_form_bottom">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
             </form>
         </field>
     </record>
@@ -284,13 +275,14 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group>
+                           <field name="name" string="Meeting / Partner"
+                               filter_domain="['|', ('name','ilike',self)]"/>
+                           <separator orientation="vertical"/>                   
                            <filter string="My Meetings"
                                    icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
-                           <separator orientation="vertical"/>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
+                           <separator orientation="vertical"/>   
                            <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
@@ -306,7 +298,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
                 <field name="arch" type="xml">
-                    <field name="ref" position="after">
+                    <field name="language" position="after">
                         <field name="categ_id" string="Event Type"/>
                     </field>
                 </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f3dff746cf2..77f46c48cbd 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,48 +65,50 @@
             <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending"/>
+                        states="draft,pending" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" type="object"
-                        states="open,pending"/>
+                        states="open,pending" icon="gtk-jump-to"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel"/>
+                        states="cancel" icon="gtk-convert"/>
                 <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending"/>
+                        states="draft,open,pending" icon="gtk-cancel"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    type="action"
+                    icon="gtk-index" type="action"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Schedule Other Call"
+                    icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
-                  <div class="oe_form_title">
-                      <div class="oe_form_readonly_hidden">
-                          <label for="name" string="Title"/> 
-                      </div>
-                      <h1><field name="name" required="1"/></h1>
-                      <div class="oe_form_readonly_hidden">
-                        <label for="partner_phone" string="Phone" />
-                      </div>
-                      <h2><field name="partner_phone"/></h2>
-                  </div>
                  <group col="4">
-                    <field name="date" />
-                    <field name="user_id" />
-                    <field name="duration" widget="float_time" />
+                    <field name="name" required="1"/>
+                    <field name="partner_phone"/>
+                    <field name="duration" widget="float_time"/>
+
+                    <field name="date"/>
+                    <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile" />
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
                 </group>
 
-                <field name="description" placeholder="Description..." />
+                <group>
+                    <group string="Contacts">
+                        <field name="partner_id"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_mobile"/>
+                    </group>
+                    <group string="Categorization">
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
+                </group>
+                <separator string="Description"/>
+                <field name="description"/>
             </sheet>
             <footer>
                 <field name="message_ids" widget="ThreadView"/>
@@ -177,8 +179,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <field name="name" string="Phonecalls" filter_domain="[('name','ilike',self)]"/>
                <separator orientation="vertical"/>
+               <field name="date"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
               <filter string="Unassigned Phonecalls"
                        icon="terp-personal-"
                        domain="[('user_id','=',False)]"
@@ -188,13 +193,11 @@
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="Phone Calls that are assigned to me or to my team(s)" />
                <separator orientation="vertical"/>
-               <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id"/>
                <field name="section_id"
                    widget="selection" string="Sales Team"/>
-               <field name="date"/>
-               <newline/>
+               <separator orientation="vertical"/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index aaad73af29a..47c9b5364d6 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -157,9 +157,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                        <field name="name"/>
-                        <field name="month"/>
+                        <field name="name" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="section_id" widget="selection"/>
+                        <field name="month"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index dc23c256f2f..7d6c5922d3b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -82,7 +82,6 @@
                             name="opportunity"
                             domain="[('type','=','opportunity')]"
                             help="Show only opportunity"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="New"
                             domain="[('state','=','draft')]"
@@ -99,7 +98,6 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
@@ -110,7 +108,7 @@
                             context="{'invisible_section': False}"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical" />
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
@@ -125,7 +123,7 @@
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical" />
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index cd54f8e4e37..ce7f0ac4124 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -64,7 +64,6 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
@@ -76,7 +75,7 @@
                             context="{'invisible_section': False}"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
@@ -86,7 +85,7 @@
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 54685a87c48..80daa7bb832 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -39,7 +39,7 @@
                     <field name="category_id" position="after">
                         <field name="section_id" completion="1" widget="selection"/>
                     </field>
-                    <xpath expr="//filter[@string='Company']" position="after">
+                    <xpath expr="//field[@name='user_id']" position="after">
                         <field name="country_id"/>
                     </xpath>
                 </field>
@@ -85,27 +85,6 @@
             </field>
         </record>
 
-
-        <record model="ir.ui.view" id="res_partner_view_buttons">
-            <field name="name">res.partner.view.buttons</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='buttons']" position="inside">
-                    <button type="action"
-                        string="Schedule a Meeting"
-                        name="%(crm.crm_case_categ_meet_create_partner)d"
-                        context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
-                    <button type="action" string="Schedule a Call" 
-                        name="%(crm.crm_case_categ_phone_create_partner)d" 
-                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
-                    <button type="action" string="Create an Opportunity"
-                        name="%(crm.action_view_crm_partner2opportunity)d" />
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 224446672e7..dc7653861d8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -196,6 +196,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
+                    <field name="name" string="Claims" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New" name="current"
                         domain="[('state','=','draft')]"
                         help="New Claims" />
@@ -209,16 +211,14 @@
                         domain="[('state','=','pending')]"
                         help="All pending Claims"
                     />
-                    <separator orientation="vertical"/>
                     <filter string="Unassigned Claims"
                             icon="terp-personal-"
                             domain="[('user_id','=', False)]"
                             help="Unassigned Claims" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index eefc534fc0e..9d99d72ec69 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -63,29 +63,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-
                             <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
                             <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-
-                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 7d515650944..7959d5a40c0 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -163,6 +163,8 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
+                            <field name="name" string="Fund Description" filter_domain="[('name','ilike',self)]"/>
+                            <separator orientation="vertical" />
                             <filter icon="terp-check" string="New"
                                 domain="[('state','=','draft')]" name="current"
                                 help="New Funds" />
@@ -173,7 +175,6 @@
                                 string="Pending"
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
-                            <separator orientation="vertical" />
                             <filter string="Unassigned"
                                     icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
@@ -184,13 +185,11 @@
                                     help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
                             <separator orientation="vertical" />
                             <field name="state"/>
-                            <field name="name"
-                                string="Fund Description" />
-                            <field name="user_id"
+                            <field name="user_id" 
                                 widget="selection"/>
                             <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
-                        <newline/>
+                        <separator orientation="vertical" />
                         <group expand="0" string="Group By...">
                             <filter string="Partner" icon="terp-partner"
                                 domain="[]"
@@ -198,14 +197,12 @@
                             <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Category" help="Fund Category"
                                 icon="terp-stock_symbol-selection" domain="[]"
                                 context="{'group_by':'categ_id'}" />
                             <filter string="Payment Mode" help="Payment Mode"
                                 icon="terp-dolar" domain="[]"
                                 context="{'group_by':'type_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index d33d3f0d05d..e0d206b615d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -87,27 +87,24 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
                             <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
                             <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group  expand="0" string="Extended Filters...">
                         <filter icon="terp-dialog-close"
                             string="Done"
@@ -119,7 +116,7 @@
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 811e5a1cc90..75ac113d26a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -149,6 +149,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
+                    <field name="name" string="Query" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New"
                         name="current"
                         domain="[('state','=','draft')]"
@@ -163,18 +167,15 @@
                         domain="[('state','=','pending')]"
                         help="All pending Helpdesk Request"
                     />
-                    <separator orientation="vertical"/>
                     <filter string="Assigned to Me or My Sales Team(s)"
                             icon="terp-personal+"
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
                     <separator orientation="vertical"/>
-                    <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
                     <field name="section_id" widget="selection" string="Sales Team"/>
-                    <field name="date"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index f1d111747f0..9cceffbe15a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -60,27 +60,24 @@
                         domain="[('state','=','open')]" />
                         <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                             <filter string="My Sales Team(s)"
                             icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
                             <filter string="My Company"
                             icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>   
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
@@ -88,7 +85,7 @@
                         <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 83f0e470c55..1e4908ba4d3 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -62,7 +62,6 @@
                 </filter>
 
                 <field name="user_id" position="after">
-                    <separator orientation="vertical"/>
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index a34a9139c3c..736cb3fab85 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -16,7 +16,7 @@
                         <filter icon="terp-dialog-close"
                             string="Closed"
                             domain="[('state','=','done')]"/>
-                        <separator orientation="vertical" />
+                        <separator orientation="vertical"/>
                         <field name="section_id"
                             widget="selection"
                             context="{'invisible_section': False}"/>
@@ -24,7 +24,7 @@
                         <field name="user_id"/>
                         <field name="partner_assigned_id"/>
                    </group>
-                   <newline/>
+                   <separator orientation="vertical"/>
                    <group  expand="0" string="Extended Filters...">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
@@ -37,7 +37,7 @@
                       <field name="opening_date"/>
                       <field name="date_closed"/>
                    </group>
-                   <newline/>
+                   <separator orientation="vertical"/>
                    <group  expand="1" string="Group By...">
                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index d652848f0fe..3777b424ca5 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -15,7 +15,7 @@
                         <field name="grade_id"/>
                         <field name="activation"/>
                    </group>
-                   <newline/>
+                   <separator orientation="vertical" />
                    <group  expand="1" string="Group By...">
                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />