diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 11eecc94b1b..29bd78d5223 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,29 +2,23 @@
 <openerp>
   <data noupdate="1">
 
-    <record model="note.stage" id="note_stage_today">
-      <field name="name">Today</field>
+    <record model="note.stage" id="note_stage_01">
+      <field name="name">Todo today</field>
       <field name="sequence">1</field>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.stage" id="note_stage_tomorrow">
-      <field name="name">Tomorrow</field>
+    <record model="note.stage" id="note_stage_02">
+      <field name="name">Todo later</field>
       <field name="sequence">2</field>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.stage" id="note_stage_week">
-      <field name="name">This week</field>
+    <record model="note.stage" id="note_stage_03">
+      <field name="name">For information</field>
       <field name="sequence">3</field>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.stage" id="note_stage_month">
-      <field name="name">This month</field>
-      <field name="sequence">4</field>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index 3e960638de0..76f525b88ca 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data>
 
-    <record model="note.note" id="note_1">
+    <record id="note_1" model="note.note">
       <field name="note"><![CDATA[Buying list
     * coffee
     * fruits
@@ -11,10 +11,11 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_today"/>
+      <field name="stage_id" ref="note_stage_01"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">2</field>
     </record>
-    <record model="note.note" id="note_2">
+    <record id="note_2" model="note.note">
       <field name="note"><![CDATA[Buying list
     * more coffee
     * tee
@@ -23,11 +24,11 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_tomorrow"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_3">
+    <record id="note_3" model="note.note">
       <field name="note"><![CDATA[Idea to develop
     * Phasellus vel eros lorem, vel tristique risus.
     * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
@@ -51,22 +52,22 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_week"/>
+      <field name="stage_id" ref="note_stage_01"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_4">
+    <record id="note_4" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_5">
+    <record id="note_5" model="note.note">
       <field name="note"><![CDATA[New computer specs
       * Motherboard
       according to processor
@@ -85,129 +86,66 @@
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">3</field>
     </record>
 
-    <record model="note.note" id="note_6">
+    <record id="note_6" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_7">
+    <record id="note_7" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_8">
+    <record id="note_8" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">5</field>
     </record>
 
-    <record model="note.note" id="note_9">
+    <record id="note_9" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_03"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_10">
+    <record id="note_10" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_11">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_12">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_13">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_14">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_15">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_16">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_03"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">7</field>
     </record>
 
   </data>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 4a025a45b23..2086794bb04 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data>
 
-    <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+    <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
       <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
       <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>