diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e1e10adf0a2..7600fae71be 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -12,7 +12,6 @@
 
         <record model="crm.team" id="sales_team.crm_team_1">
             <field name="name">Indirect Sales</field>
-            <field name="code">IM</field>
             <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
         </record>
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a64e56e1639..a5562896656 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -106,9 +106,12 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             help="Convert to Opportunity" class="oe_highlight"/>
+                    <button name="case_mark_won" string="Mark Won" attrs="{'invisible': [('probability', '=', 100)]}" type="object"/>
+                    <button name="case_mark_lost" string="Mark Lost" attrs="{'invisible': [('active', '=', False)]}" type="object"/>
+                    <button name="case_mark_active" string="Active" attrs="{'invisible': [('active', '=', True)]}" type="object" class="pull-right"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
                             domain="['&amp;', ('team_ids', '=', team_id), '|', ('type', '=', type), ('type', '=', 'both')]"
-                            options="{'fold_field': 'fold'}"
+                            options="{'fold_field': 'fold'}" attrs="{'invisible': [('active', '=', False)]}"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
@@ -385,10 +388,10 @@
                 <form string="Opportunities">
                     <header>
                         <button name="case_mark_won" string="Mark Won" attrs="{'invisible': [('probability', '=', 100)]}" type="object" class="oe_highlight"/>
-                        <button name="case_mark_active" string="Active" attrs="{'invisible': [('active', '=', True)]}" type="object"/>
                         <button name="case_mark_lost" string="Mark Lost" attrs="{'invisible': [('active', '=', False)]}" type="object" class="oe_highlight"/>
+                        <button name="case_mark_active" string="Active" attrs="{'invisible': [('active', '=', True)]}" type="object" class="pull-right"/>
                         <field name="stage_id" widget="statusbar" clickable="True"
-                            options="{'fold_field': 'fold'}"
+                            options="{'fold_field': 'fold'}" attrs="{'invisible': [('active', '=', False)]}"
                             domain="['&amp;', ('team_ids', '=', team_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                     </header>
                     <sheet>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 56ddb1f6b19..684d2a51844 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -31,9 +31,9 @@
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
             <field name="suffix">days</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
-            <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
+            <field name="model_id" eval="ref('crm.model_crm_opportunity_report')" />
+            <field name="field_id" eval="ref('crm.field_crm_opportunity_report_delay_close')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_opportunity_report_date_closed')" />
             <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
         </record> 
 
@@ -43,9 +43,9 @@
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
             <field name="suffix">days</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
-            <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
+            <field name="model_id" eval="ref('crm.model_crm_opportunity_report')" />
+            <field name="field_id" eval="ref('crm.field_crm_opportunity_report_delay_open')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_opportunity_report_opening_date')" />
             <field name="domain">[('user_id','=',user.id)]</field>
         </record> 
 
diff --git a/addons/sales_team/sales_team_data.xml b/addons/sales_team/sales_team_data.xml
index 4e17374f12a..f9a48772402 100644
--- a/addons/sales_team/sales_team_data.xml
+++ b/addons/sales_team/sales_team_data.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record model="crm.team" id="team_sales_department">
             <field name="name">Direct Sales</field>
-            <field name="code">DM</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
diff --git a/addons/sales_team/sales_team_demo.xml b/addons/sales_team/sales_team_demo.xml
index bb1276f0b5c..f2d70c28eab 100644
--- a/addons/sales_team/sales_team_demo.xml
+++ b/addons/sales_team/sales_team_demo.xml
@@ -10,7 +10,6 @@
         </record>
         <record model="crm.team" id="crm_team_1">
             <field name="name">Indirect Sales</field>
-            <field name="code">IM</field>
             <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
         </record>