diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 919080c42ca..2557e934cf1 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -323,7 +323,7 @@
                         <newline/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
-                        <field name="routing_id" widget="selection" groups="base.group_extended"/>
+                        <field name="routing_id"  groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos_qty" groups="product.group_uos" />
                         <field name="product_uos"  groups="product.group_uos"/>
@@ -567,8 +567,9 @@
                         <field name="origin"/>
                         <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
-                        <group colspan="2" col="3">
+                        <group colspan="2" col="4">
                         <field name="product_uom"/>
+                        <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
@@ -582,7 +583,7 @@
                     <notebook colspan="4">
                         <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" widget="selection"/>
+                            <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')]"/>
                             <separator string="" colspan="4"/>
@@ -632,7 +633,6 @@
                             <group col="9" colspan="4">
                                 <field name="state"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                                <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
                                 <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"/>
@@ -904,7 +904,7 @@
 
         <act_window
             domain="[('bom_id','=',False)]"
-            context="{'search_default_product_id': [active_id]}"
+            context="{'search_default_product_id': [active_id],'default_product_id':active_id}"
             id="act_product_product_2_mrp_bom"
             name="Bill of Materials"
             res_model="mrp.bom"