diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3c2b8f48eb6..a3eb65d6a80 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -398,8 +398,8 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities" layout="manual">
-                <div class="oe_form_topbar oe_form_topbar_hifirst">
+            <form string="Opportunities" validate="0">
+                <header class="oe_form_topbar_hifirst">
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" />
@@ -407,15 +407,10 @@
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft" type="object" />
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
+                <sheet>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2" width="auto">
-                    <field name="name" required="1" nolabel="1" class="oe_form_title"/>
-                    <div class="oe_text_right">
                         <button string="Schedule/Log Call"
                             name="%(opportunity2phonecall_act)d" icon="terp-call-start"
                             type="action"/>
@@ -423,113 +418,116 @@
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                </group>
-                <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
-                    <field name="user_id"/>
-                    <field name="planned_revenue"/>
+                    <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>
 
-                    <field name="date_action"/>
-                    <field name="date_deadline"/>
+                    <group class="oe_clear" style="margin: 20px 0">
+                        <field name="user_id"/>
 
-                    <field name="title_action"/>
-                    <field name="probability"/>
+                        <field name="date_action"/>
+                        <field name="date_deadline"/>
 
-                    <field name="type" invisible="1"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Opportunity">
-                    <group col="4" colspan="2">
-                        <separator colspan="4" string="Contacts"/>
-                        <group colspan="2" col="3" class="oe_form_group_label_border">
-                            <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" />
+                        <field name="title_action"/>
+
+                        <field name="type" invisible="1"/>
+                    </group>
+
+                    <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>
-                    </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator 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')]" />
+                    </page>
+                    <page string="Lead">
+                        <group string="Contact">
+                            <field name="partner_name" string="Customer Name" colspan="4"/>
+                            <group colspan="2" col="2">
+                                <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
+                                <field name="fax"/>
+                                <field name="street"/>
+                                <field name="zip"/>
+                                <field name="country_id"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <field name="function" />
+                                <field name="mobile"/>
+                                <field name="street2"/>
+                                <field name="city"/>
+                                <field name="state_id"/>
+                            </group>
 
-                        <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 colspan="2" col="2" string="Categorization">
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
+                            </group>
+                            <group colspan="2" col="2" string="Mailings">
+                                <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
+                                <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                            </group>
                         </group>
-
-                        <field name="priority" string="Priority"/>
-                    </group>
-
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                </page>
-                <page string="Lead">
-                    <separator string="Contact" colspan="4"/>
-                    <group colspan="4" col="4" class="oe_form_group_label_border">
-                        <field name="partner_name" string="Customer Name" colspan="4"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="fax"/>
-                        <field name="street"/>
-                        <field name="zip"/>
-                        <field name="country_id"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field name="function" />
-                        <field name="mobile"/>
-                        <field name="street2"/>
-                        <field name="city"/>
-                        <field name="state_id"/>
-                    </group>
-
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Mailings" colspan="2"/>
-                        <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                        <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
-                    </group>
-                </page>
-                <page string="Extra Info">
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open" groups="base.group_no_one"/>
-                        <field name="day_close" groups="base.group_no_one"/>
-                        <field name="referred"/>
-                    </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="4" string="References"/>
-                        <field name="ref"/>
-                        <field name="ref2"/>
-                    </group>
-                </page>
-                </notebook>
+                    </page>
+                    <page string="Extra Info">
+                        <group>
+                            <group col="2" colspan="2" string="Misc">
+                                <field name="active"/>
+                                <field name="day_open" groups="base.group_no_one"/>
+                                <field name="day_close" groups="base.group_no_one"/>
+                                <field name="referred"/>
+                            </group>
+                            <group col="2" colspan="2" string="References">
+                                <field name="ref"/>
+                                <field name="ref2"/>
+                            </group>
+                        </group>
+                    </page>
+                    </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
+                <footer>
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                </footer>
             </form>
         </field>
     </record>