diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f018a355579..f91a8756598 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -132,8 +132,6 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
@@ -188,7 +186,11 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <field name="section_id"/>
+                            <label for="section_id"/>
+                            <div>
+                                <field name="section_id"/>
+                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
+                            </div>
                             <field name="type" invisible="1"/>
                         </group>
                         <group>
@@ -402,8 +404,6 @@
                                 states="draft,open,pending" class="oe_highlight"/>
                         <button name="case_mark_lost" string="Mark Lost" type="object"
                                 states="draft,open" class="oe_highlight"/>
-                        <button name="case_escalate" string="Escalate" type="object"
-                                states="open" />
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet>
@@ -449,7 +449,11 @@
 
                             <group>
                                 <field name="user_id"/>
-                                <field name="section_id" colspan="1" widget="selection"/>
+                                <label for="section_id"/>
+                                <div>
+                                    <field name="section_id" widget="selection"/>
+                                    <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" />
+                                </div>
                             </group>
                             <group>
                                 <field name="categ_ids"
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index d120550e3b9..00c68186108 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -181,7 +181,7 @@
         </record>
 
         <record id="sale.sale_order_5" model="sale.order">
-        <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="base.main_company"/>
         </record>
 
 
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index be871b87796..e54ba158b9b 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
-                        <button states="done" string="Convert to Quote" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
-                        <button states="draft,open,pending" string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
+                        <button states="done" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
+                        <button states="draft,open,pending" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action"/>
                     </xpath>
                 </data>
             </field>