diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1ff9daf8608..7bd9689e403 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -14,7 +14,7 @@
         <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle.</field>
     </record>
     
-    <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
+    <record id="action_stage_tree_view1" model="ir.actions.act_window.view">
         <field eval="1" name="sequence"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_stage_tree"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4dff3dd6337..70dedb28276 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -11,6 +11,20 @@
         <field name="context">{'type':'opportunity'}</field>
         <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
     </record>
+    
+     <record id="action_stage_tree_view2" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_stage_tree"/>
+        <field name="act_window_id" ref="crm_opportunity_stage_act"/>
+    </record>
+        
+    <record id="action_stage_form_view2" model="ir.actions.act_window.view">
+    	<field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_stage_form_full"/>
+        <field name="act_window_id" ref="crm_opportunity_stage_act"/>
+    </record>
 
      <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1ae93a3b2ec..55d255ba542 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -108,7 +108,6 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="probability"/>
-                    <field name="type" />
                 </tree>
             </field>
         </record>
@@ -142,11 +141,11 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <form string="Stage">
-                	<group col="6">
-                    	<separator string="Stage Definition" colspan="6"/>
-	                    <field name="name" select="1" colspan="4"/>
+                	<group>
+                    	<separator string="Stage Definition" colspan="4" />
+	                    <field name="name" select="1"/>
 	                    <field name="sequence"/>
-                   	 	<field name="type" />
+                   	 	<field name="type" invisible="1" />
                    	 	 <field name="probability"/>
                    		<field name="on_change"/>
                    	 </group>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a6f81885714..a0a7eb7c545 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -33,7 +33,20 @@
             <field name="context">{'type':'claim'}</field>
             <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
-
+        
+        <record id="action_stage_tree_view3" model="ir.actions.act_window.view">
+	        <field eval="1" name="sequence"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+	        <field name="act_window_id" ref="crm_claim_stage_act"/>
+	    </record>
+	        
+	    <record id="action_stage_form_view3" model="ir.actions.act_window.view">
+	    	<field eval="2" name="sequence"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_form_full"/>
+	        <field name="act_window_id" ref="crm_claim_stage_act"/>
+		</record>
          <menuitem action="crm_claim_stage_act" name="Stages"
                 id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 51a2a2fa6b4..9c61017c33c 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -33,6 +33,20 @@
             <field name="context">{'type':'fundraising'}</field>
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
+        
+        <record id="action_stage_tree_view4" model="ir.actions.act_window.view">
+	        <field eval="1" name="sequence"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+	        <field name="act_window_id" ref="crm_fundraising_stage_act"/>
+	    </record>
+	        
+	    <record id="action_stage_form_view4" model="ir.actions.act_window.view">
+	    	<field eval="2" name="sequence"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_form_full"/>
+	        <field name="act_window_id" ref="crm_fundraising_stage_act"/>
+		</record>
 
          <menuitem action="crm_fundraising_stage_act"
             groups="base.group_extended" name="Stages"