diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index e4d5f5999cb..8308e5420d0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -105,7 +105,7 @@ class crm_claim(base_stage, osv.osv):
         'email_from': fields.char('Email', size=128, help="Destination email for email gateway."),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage',
-                        domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
+                        domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
         'cause': fields.text('Root Cause'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 33bd280c364..ed0558f72e9 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -43,38 +43,32 @@
         -->
         
         <record model="crm.claim.stage" id="stage_claim1">
-            <field name="name">Draft claim</field>
+            <field name="name">New</field>
             <field name="state">draft</field>
             <field name="sequence">26</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim5">
-            <field name="name">Actions Defined</field>
+            <field name="name">In Progress</field>
             <field name="state">open</field>
             <field name="sequence">27</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim2">
-            <field name="name">Actions Done</field>
+            <field name="name">Settled</field>
             <field name="state">done</field>
             <field name="sequence">28</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim3">
-            <field name="name">Refused</field>
-            <field name="state">done</field>
+            <field name="name">Rejected</field>
+            <field name="state">cancel</field>
             <field name="sequence">29</field>
             <field name="case_default" eval="True"/>
             <field name="case_refused" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
-        <record model="crm.claim.stage" id="stage_claim3">
-            <field name="name">Cancelled</field>
-            <field name="state">cancel</field>
-            <field name="sequence">30</field>
-            <field name="case_default" eval="True"/>
-            <field name="fold" eval="True"/>
-        </record>
+        
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 2b5ca4b1556..aa4243a6838 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -102,16 +102,11 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object" class="oe_highlight"
-                            states="draft,pending" groups="base.group_user"/>
-                    <button name="case_close" string="Done" type="object" class="oe_highlight"
-                            states="open,pending" groups="base.group_user"/>
-                    <button name="case_reset" string="Reset to Draft" type="object" groups="base.group_user"
-                            states="cancel,done"/>
-                    <button name="case_cancel" string="Cancel" type="object"  groups="base.group_user"
+                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
+                            states="draft,open,pending" groups="base.group_user"/>
+                    <button name="case_cancel" string="Reject" type="object"  groups="base.group_user"
                             states="draft,open,pending"/>
-                    <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
+                    <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
                     <group>