diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f16402e5bd8..41ad721336f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -26,88 +26,96 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                <group colspan="4" col="5">
-                    <field name="partner_name" string="Lead Name" required="1"/>
-                    <field name="name" string="Lead Subject"/>                                       
-                    <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
-                    <newline/>
-                    <field name="partner_name2" string="Contact Name"/>                    
-                    <field name="email_from" string="Email"/>                    
-                    
-                </group>
-                <notebook colspan="4">
-                <page string="Leads">
-                    <separator colspan="4" string="Communication"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <label string="Partner:" align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="partner_id" nolabel="1" colspan="1"/>
-                        <button string="Convert to Partner"
-                            icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                            type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                        />
+                <group>
+                    <group colspan="3" col="4">
+                        <field name="partner_name" string="Lead Name" required="1"/>
+                        <field name="name" string="Lead Subject"/>
+                        <field name="partner_name2" string="Contact Name"/>                    
+                        <field name="email_from" string="Email"/>                    
+                        
                     </group>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-
-                    <separator colspan="4" string="Status and Categarization"/>
-                    <group colspan="4" col="6">
-                        <field name="user_id" select="2"/>
-                        <label string="Status: " align="1.0"/>
+                    <group colspan="1" col="1">
+                    <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
+                    <label string=""/>
+                    </group>
+                    <group colspan="3" col="4">
+                    <notebook>
+                    <page string="Leads">
+                        <separator colspan="4" string="Communication"/>
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                        <label string="Partner:" align="1.0"/>
                         <group colspan="1" col="2">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                            <field name="partner_id" nolabel="1" colspan="1"/>
+                            <button string="Convert to Partner"
+                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                            />
                         </group>
-                        <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                   
-                        <field name="type_id" string="Campaign" select="1"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="priority" string="Priority"/>
-        
-                        <field name="create_date"/>
-	                </group>
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
+                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="2"/>
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
-                    </group>
-                 </page>
-                 <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="7" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                                <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
+                        <separator colspan="4" string="Status and Categarization"/>
+                        <group colspan="4" col="6">
+                            <field name="user_id" select="2"/>
+                            <label string="Status: " align="1.0"/>
+                            <group colspan="1" col="2">
+                                <field name="stage_id" select="1" nolabel="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                                <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                             </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>
-                </notebook>
+                            <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                       
+                            <field name="type_id" string="Campaign" select="1"/>
+                            <field name="section_id" colspan="1" widget="selection"/>
+                            <field name="priority" string="Priority"/>
+            
+                            <field name="create_date"/>
+	                    </group>
+                        <separator colspan="4" string="Details"/>
+                        <field name="description" nolabel="1" colspan="4"/>
+
+                        <separator colspan="4"/>
+                        <group col="8" colspan="4">
+                            <field name="state" select="2"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                        </group>
+                     </page>
+                     <page string="Emails" groups="base.group_extended">
+                       <group colspan="4">
+                           <field colspan="4" name="email_cc" string="CC"/>
+                       </group>
+                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                            <form string="Communication history">
+                                <group col="7" colspan="4">
+                                    <field name="date"/>
+                                    <field name="email"/>
+                                    <field name="canal_id"/>
+                                    <button
+                                       string="Add a CC"
+                                        name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                        icon="gtk-add" type="action"/>
+                                </group>
+                                <newline/>
+                                <field name="description" colspan="4" nolabel="1"/>
+                                <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
+                            </form>
+                            <tree string="Communication history">
+                                <field name="description"/>
+                                <field name="email"/>
+                                <field name="date"/>
+                            </tree>
+                        </field>
+                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                     </page>
+                    </notebook>
+                    </group>
+
+                </group>
+
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 8e7f17fcfff..3185be1a457 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -39,24 +39,25 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
-                <group colspan="4" col="5">                    
+                <group colspan="3" col="4">                    
                     <field name="name" select="1" string="Opportunity" colspan="4"/>
-                    <button string="Schedule a Meeting"
-                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
-                    <newline/>
                     <field name="planned_revenue" required="1"/>
                     <field name="planned_cost"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
-                    <newline/>
                     <field name="probability"/>
-                    <field name="date_deadline" string="Excepted Close Date"/>
+                    <field name="date_deadline" string="Excepted Close Date" required="1"/>
                     
                 </group>
-                <notebook colspan="4">
+                <group colspan="1" col="1">
+                    <button string="Schedule Meeting"
+                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+                    <button string="Schedule Call"
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                </group>
+                <group colspan="3" col="4">
+                <notebook>
                 <page string="Opportunity">
                     <separator colspan="4" string="Communication"/>                    
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                    <field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                     <field name="email_from" colspan="2" string="Email"/>
                     <field name="partner_phone" colspan="2"/>
@@ -66,7 +67,7 @@
                         <field name="user_id" select="2" string="Responsible"/>
                         <label string="Sales Stage: " align="1.0"/>
                         <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1"/>
+                        <field name="stage_id" select="1" nolabel="1" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                         <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
@@ -146,6 +147,7 @@
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
                  </page>
                 </notebook>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index a6f6868dc21..30700eb0487 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,13 +8,9 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
-            <field name="user_id" position="replace">
-                <label string="Responsible: " align="1.0"/>
-                <group colspan="1" col="2">
-                    <field name="user_id" select="2" nolabel="1" string="Responsible"/>
-                    <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
-                </group>
-            </field>
+            <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
+                <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
+            </xpath>           
         </field>
     </record>