diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4fd756a811f..db96f3cdf03 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -412,69 +412,71 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
                 </div>
-                <sheet layout="auto">
-                <group colspan="4" col="7">
-                    <field name="name"  required="1" string="Opportunity"/>
-                    <label string="Stage" for="stage_id" align="1.0"/>
-                    <group colspan="1" col="4">
-                        <field name="stage_id" nolabel="1"
-                            on_change="onchange_stage_id(stage_id)"
-                            domain="section_id and [('section_ids', '=', section_id)] or []"/>
-                        <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>
+                <sheet layout="manual">
+                <div>
+                    <field name="name" required="1" nolabel="1" class="oe_form_title" style="width: 100%%"/>
+                    <div class="oe_right">
+                        <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                            type="action"/>
+                        <button string="Schedule Meeting" icon="gtk-redo"
+                            name="action_makeMeeting"
+                            type="object"/>
+                    </div>
+                </div>
+                <group colspan="4" col="4" layout="auto" class="oe_form_group_label_border">
                     <field name="user_id"/>
-
-                    <button string="Schedule/Log Call"
-                        name="%(opportunity2phonecall_act)d" icon="terp-call-start"
-                        type="action"/>
-
                     <field name="planned_revenue"/>
-                    <field name="probability"/>
+
+                    <field name="date_action"/>
                     <field name="date_deadline"/>
 
-                    <button name="action_makeMeeting" type="object"
-                    string="Schedule Meeting" icon="gtk-redo" />
-                    <newline/>
-                    <field name="date_action"/>
                     <field name="title_action"/>
-                    <field name="priority" string="Priority"/>
-                    <newline/>
+                    <field name="probability"/>
+
                     <field name="type" invisible="1"/>
                 </group>
-                <notebook colspan="4">
+                <notebook colspan="4" layout="auto">
                 <page string="Opportunity">
                     <group col="4" colspan="2">
                         <separator colspan="4" string="Contacts"/>
-                        <group colspan="2">
+                        <group colspan="2" col="3" class="oe_form_group_label_border">
                             <field name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
-                                colspan="2" />
+                                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)]}"/>
-                        </group>
-                        
-                        <group col="3" colspan="2">
-                            <field 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>
-                            <field name="phone"/>
 
+                            <field name="phone" colspan="3"/>
+
+                            <field 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">
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
                         <separator colspan="2" string="Categorization"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
-                        string="Category" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.lead')]" />
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
+
+                        <label string="Stage" for="stage_id" align="1.0"/>
+                        <group colspan="1" col="4">
+                            <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                domain="section_id and [('section_ids', '=', section_id)] or []"/>
+                            <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"/>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 224a52a104c..7a19bf66a78 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -10,7 +10,7 @@
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assignation" groups="base.group_extended">
-                        <group name="partner_assign_group" col="5" colspan="4">
+                        <group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
                             <separator string="Partner Assignation" colspan="5"/>
                             <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                             <field name="date_assign"/>
@@ -22,15 +22,12 @@
                                     context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
                                 />
                             </group>
-                            <group name="geo_assign_group" col="5" colspan="4">
-                                <separator string="Geo Assignation" colspan="5"/>
-                                <field name="partner_latitude"/>
-                                <field name="partner_longitude"/>
-                                <group colspan="1" col="1">
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
-                                </group>
-                            </group>
+
+                            <separator string="Geo Assignation" colspan="5"/>
+                            <field name="partner_latitude"/>
+                            <field name="partner_longitude"/>
+                            <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
+                                icon="gtk-apply"/>
                         </group>
                         </page>
                     </xpath>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index a96892b990f..872727f4a36 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,9 +8,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
-                <field name="priority" position="after">
-                    <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
-                </field>
+                <data>
+                    <xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
+                        <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
+                    </xpath>
+                </data>
             </field>
         </record>