diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 86e8b655f95..59dc443f5fc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -967,10 +967,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_id']" position="before">
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
                     <separator colspan="4" string="Properties" />
                     <field colspan="4" name="property_ids" nolabel="1"/>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 164314c4573..7e398f73125 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -106,10 +106,10 @@ class procurement_order(osv.osv):
         'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
         'state': fields.selection([
             ('draft','Draft'),
+            ('cancel','Cancelled'),
             ('confirmed','Confirmed'),
             ('exception','Exception'),
             ('running','Running'),
-            ('cancel','Cancel'),
             ('ready','Ready'),
             ('done','Done'),
             ('waiting','Waiting')], 'State', required=True,
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index b3e90ab4e6e..e859aeb98be 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -46,8 +46,18 @@
             <field name="model">procurement.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement">
-                    <group col="2" colspan="2">
+                <form layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
+                        <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
+                    </div>
+                    </div>
+                <sheet string="Procurement" layout="auto">
+                    <group col="2" colspan="2" class="oe_form_header">
                         <separator colspan="2" string="References"/>
                         <field name="name" string="Procurement Reason"/>
                         <field name="origin"/>
@@ -72,13 +82,6 @@
 
                         <separator colspan="4" string="Status"/>
                         <field colspan="4" name="message" readonly="1"/>
-                        <field name="state" readonly="1"/>
-                        <group col="7" colspan="2">
-                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
-                        </group>
                     </page>
                     <page string="Extra Information">
                         <separator colspan="4" string="Details"/>
@@ -91,6 +94,7 @@
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 483f090d4a7..83f5d52ec67 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -512,7 +512,7 @@
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
             </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 93fefe79c65..2855881cf36 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -200,7 +200,7 @@
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">
-             <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+             <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
                 <field name="requisition_id"/>
             </xpath>
         </field>