diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index bb587218c91..4787aa2603b 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,7 +128,7 @@ class report_account_analytic_planning(osv.osv):
         'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
         'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('open', 'Open'), ('done', 'Done')], 'Status', required=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True),
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 5e42c750634..4f10d270ac4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -26,8 +26,18 @@
             <field name="model">report_account_analytic.planning</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Planning by Account">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                 <div class="oe_form_topbar">
+                    <button name="action_open" states="draft" string="Open" type="object" icon="gtk-yes" />
+                    <button name="action_done" states="open" string="Done" type="object" icon="gtk-jump-to" />
+                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" icon="gtk-cancel" />
+                 <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                 </div>
+                 </div>
+                <sheet string="Planning by Account" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1" />
                         <field name="code" select="1" />
                         <field name="user_id" select="1" />
@@ -134,18 +144,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" select="1"
-                            readonly="1" />
-                        <button name="action_cancel" states="draft,open"
-                            string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="action_open" states="draft"
-                            string="Open" type="object" icon="gtk-yes" />
-                        <button name="action_done" states="open"
-                            string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="action_draft" states="done,cancel"
-                            string="Reset to Draft" type="object" icon="gtk-convert" />
-                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>