diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 112440cef68..af702600e28 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -26,8 +26,9 @@
         <field name="arch" type="xml">
             <form string="Helpdesk Support">
                 <group colspan="4" col="7">
-                    <field colspan="2" name="name" select="1"/>
-                    <field colspan="1" name="section_id" widget="selection"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="section_id" widget="selection"/>
+					<newline/>
                     <field name="date" select="1"/>
                     <field name="date_deadline" select="2"/>
                     <field name="priority"/>
@@ -127,7 +128,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue"/>
                 <field name="probability"/>
-                <field name="date" string="Deadline"/>
+                <field name="date_deadline"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 933a9d69a0e..75883d1122b 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -6,7 +6,7 @@
 <!--        MENU        -->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
-        <field name="name">All Leads</field>
+        <field name="name">Leads</field>
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0c2f0f83b84..3bcb3e57363 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -38,7 +38,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                <group colspan="4" col="7">
+                <group colspan="4" col="6">
                     <field name="name" select="1" string="Lead Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" select="2"/>
@@ -50,11 +50,10 @@
                     </group>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
                     <field name="type_id" string="Campaign Type" select="1"/>
-                </group>
-                <field name="date" string="Deadline"/>
-                <group colspan="2" col="4">
+                    <newline/>
+                	<field name="date_deadline"/>
 	                <field name="opportunity_id" string="Opportunity Case"/>
-	                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+	                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('opportunity_id','!=',False)]}"  colspan="2"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Leads">
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 02c238682d7..7a2a0c21d3f 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -22,7 +22,7 @@
             view_type="form"/>            
             
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">All Opportunities</field>
+          <field name="name">Opportunities</field>
           <field name="res_model">crm.opportunity</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 519dbe4c725..59897f48503 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -51,7 +51,7 @@
                         <field name="stage_id" select="1" nolabel="1"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
-                    <field name="date_deadline" string="Deadline"/>
+                    <field name="date_deadline"/>
                     <field name="date" />
                     <group colspan="2">
                         <field name="phonecall_id" />