diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7addfbc3194..800511eb14f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -579,8 +579,8 @@
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" />
                             <field name="routing_id" groups="base.group_extended" select="1"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)" widget="selection"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
                             <separator string="" colspan="4"/>
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
@@ -628,11 +628,11 @@
                             <group col="9" colspan="4">
                                 <field name="state"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
+                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
                             </group>
                         </page>
@@ -673,7 +673,7 @@
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
                                     <field colspan="4" name="name"/>
-                                    <field colspan="4" name="workcenter_id"/>
+                                    <field name="workcenter_id" widget="selection"/>
                                     <field name="sequence"/>
                                     <field name="cycle"/>
                                     <field name="hour"/>
@@ -681,7 +681,7 @@
                                 <tree string="Production Work Centers">
                                     <field name="sequence"/>
                                     <field name="name"/>
-                                    <field name="workcenter_id"/>
+                                    <field name="workcenter_id" widget="selection"/>
                                     <field name="cycle"/>
                                     <field name="hour"/>
                                 </tree>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9a93b67a36f..f089577fdb8 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -13,11 +13,12 @@
 	    <field name="arch" type="xml">
 	       <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
 	           <group colspan="8" col="8">
+	               <separator colspan="8"/>
                    <field name="state"/>
+                   <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
 	               <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
 	               <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-	               <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
 	               <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
 	               <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
                </group>
@@ -49,14 +50,14 @@
         <field name="type">tree</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <tree string="Work Orders" colors="gray:state in ('done','cancel');black:state in ('draft','startworking') and date_planned&gt;=current_date;red:date_planned&lt;current_date and state not in ('done','cancel')">
+            <tree string="Work Orders" colors="gray:state in ('done','cancel');black:state in ('draft','startworking') and date_planned&gt;=current_date;red:date_planned&lt;current_date and state in ('draft', 'confirmed', 'ready')">
                 <field name="production_id"/>
                 <field name="date_planned"/>
                 <field name="product"/>
                 <field name="qty"/>
                 <field name="uom"/>
                 <field name="name"/>
-                <field name="workcenter_id"/>
+                <field name="workcenter_id" widget="selection"/>
                 <field name="cycle"/>
                 <field name="hour"/>
                 <field name="state" />
@@ -79,7 +80,7 @@
             <form string="Work Orders">
                 <group col="6" colspan="4">
                     <field colspan="4" name="name" select="1"/>
-                    <field name="workcenter_id" select="1"/>
+                    <field name="workcenter_id" select="1" widget="selection"/>
                     <field name="production_id"/>
                     <field name="production_state"/>
                     <field name="sequence"/>
@@ -114,10 +115,10 @@
                     <separator string="" colspan="4"/>
                     <group colspan="8" col="8">
                         <field name="state"/>
+                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                         <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                         <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                         <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                         <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
                         <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
                     </group>