diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a3eb65d6a80..ff4224fd3f6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -418,65 +418,69 @@
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                    <h1>
-                        <label for="name" class="oe_form_readonly_hidden"/>
-                        <field name="name" required="1" nolabel="1" class="oe_form_title"/>
-                    </h1>
-                    <h3>
-                        <field name="planned_revenue"/> <field name="company_currency" readonly="1"/> at <field name="probability"/> %% success rate
-                    </h3>
+
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name" required="1" nolabel="1" class="oe_form_title"/></h1>
+
+                    <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                    <h3><field name="planned_revenue"/><field name="company_currency" readonly="1"/> at <field name="probability"/> %% success rate</h3>
 
                     <group class="oe_clear" style="margin: 20px 0">
+                        <field name="partner_id" select="1"
+                            on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
+
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action"/> -
+                            <field name="title_action" style="width: 63%%"/>
+                        </div>
+
+                        <field name="email_from" string="Email"/>
+                        <label for="date_deadline"/>
+                        <div>
+                            <field name="date_deadline"/>
+                        </div>
+
+                        <field name="phone"/>
+                        <field name="priority" string="Priority"/>
+
+                        <div colspan="4"><!-- Spacer --></div>
+
                         <field name="user_id"/>
+                        <field name="categ_id" select="1"
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
 
-                        <field name="date_action"/>
-                        <field name="date_deadline"/>
-
-                        <field name="title_action"/>
-
-                        <field name="type" invisible="1"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <div colspan="2"><!-- TODO FME: correct bug with incomplete row --></div>
+                        <!--
+                        <label string="Stage" for="stage_id" align="1.0"/>
+                        <group colspan="1" col="3">
+                            <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
+                            <button name="stage_previous"
+                                states="draft,open,pending" type="object"
+                                icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
+                            <button name="stage_next" states="draft,open,pending"
+                                type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                        </group>
+                        -->
                     </group>
 
+                    <field name="type" invisible="1"/>
+                                    <!--<button name="%(action_crm_lead2partner)d"
+                                        icon="terp-partner" type="action"
+                                        string="Create"
+                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>-->
+                                    <!--<button string="Mail"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail':'new', 'model': 'crm.lead'}"
+                                        icon="terp-mail-message-new" type="action" />-->
+
                     <notebook colspan="4">
                     <page string="Opportunity">
                         <group>
-                            <group col="4" colspan="2" string="Contacts">
-                                <group colspan="2" col="3">
-                                    <field width="80%%" name="partner_id" select="1"
-                                        on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
-                                    <button name="%(action_crm_lead2partner)d"
-                                        icon="terp-partner" type="action"
-                                        string="Create"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                                    <field name="phone" colspan="3"/>
-                                    <field width="80%%" name="email_from" string="Email"/>
-                                    <button string="Mail"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail':'new', 'model': 'crm.lead'}"
-                                        icon="terp-mail-message-new" type="action" />
-                                </group>
-                            </group>
-                            <group col="2" colspan="2" string="Category">
-                                <field name="section_id" colspan="1" widget="selection"/>
-                                <field name="categ_id" select="1"
-                                    string="Category" widget="selection"
-                                    domain="[('object_id.model', '=', 'crm.lead')]" />
-
-                                <label string="Stage" for="stage_id" align="1.0"/>
-                                <group colspan="1" col="3">
-                                    <field name="stage_id" nolabel="1"
-                                        on_change="onchange_stage_id(stage_id)"
-                                        domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
-                                    <button name="stage_previous"
-                                        states="draft,open,pending" type="object"
-                                        icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
-                                    <button name="stage_next" states="draft,open,pending"
-                                        type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
-                                </group>
-
-                                <field name="priority" string="Priority"/>
-                            </group>
-
                             <separator colspan="4" string="Details"/>
                             <field name="description" nolabel="1" colspan="4"/>
                         </group>
@@ -526,7 +530,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids_social" widget="ThreadView"/>
                 </footer>
             </form>
         </field>