diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 445abdb19fd..88c73398054 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -621,17 +621,30 @@
                 <sheet>
                     <label for="product_id" class="oe_edit_only"/>
                     <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" context="{'default_supply_method':'produce'}" class="oe_inline"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
                     </h1>
-                    <label for="product_qty" class="oe_edit_only"/>
-                    <h2>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="draft,cancel,confirmed,picking_except" class="oe_inline"/>
-                    </h2>
+
+                    <group>
+                        <group>
+                            <label for="product_qty" class="oe_edit_only"/>
+                            <h2>
+                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                <button type="action"
+                                        icon="terp-accessories-archiver+"
+                                        name="%(mrp.action_change_production_qty)d"
+                                        string="Change Qty" states="draft,cacel,confirmed,picking_except" class="oe_inline"/>
+                            </h2>
+                        </group>
+                        <group>
+                            <label for="bom_id" class="oe_edit_only"/>
+                            <h2>
+                                <field name="bom_id" domain="[('product_id','=',product_id)]" 
+                                       context="{'default_product_id': product_id}" 
+                                       on_change="bom_id_change(bom_id)" class="oe_inline"/>
+                            </h2>
+                        </group>
+                    </group>
                     <div groups="mrp.group_mrp_routings">
                         <label for="routing_id" class="oe_edit_only"/>
                         <h2><field name="routing_id" class="oe_inline"/></h2>
@@ -655,9 +668,6 @@
                     <notebook>
                         <page string="Consumed Products">
                             <group>
-                                <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
-                                </group>
                                 <group groups="stock.group_locations">
                                     <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')]"/>
@@ -670,7 +680,7 @@
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                            <field name="location_id"  string="Source Loc." groups="stock.group_locations"/>
+                                            <field name="prodlot_id"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
                                                 string="Consume Products" type="action"
@@ -680,7 +690,8 @@
                                                    name="%(stock.track_line)d"
                                                    string="Split in Serial Numbers"
                                                    type="action" icon="gtk-justify-fill"
-                                                   states="draft,waiting,confirmed,assigned"/>
+                                                   states="draft,waiting,confirmed,assigned" 
+                                                   groups="stock.group_production_lot"/>
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index fdc3aa03a60..51cdf133bbf 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -5,7 +5,7 @@
             <field name="name">Split Inventory Line</field>
             <field name="model">stock.inventory.line.split</field>
             <field name="arch" type="xml">
-                <form string="Split in Lots" version="7.0">
+                <form string="Split in Serial number" version="7.0">
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index b3a7fbee885..6bd49ddbda6 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -8,14 +8,15 @@
             <field name="model">stock.move.consume</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
-                    <group string="Consume Products">
+                    <seperator string="Consume Products"/>
+                    <group>
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty"/>
-                            <field name="product_uom" nolabel="1" readonly="1"/>
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id"/>
+                        <field name="location_id" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
@@ -46,9 +47,9 @@
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline" readonly="1"/>
+                            <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
+                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
@@ -69,10 +70,10 @@
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
-                <field name="name">Split in lots</field>
+                <field name="name">Split in Serial Numbers</field>
                 <field name="model">stock.move.split</field>
                 <field name="arch" type="xml">
-                <form string="Split in Lots" version="7.0">
+                <form string="Split in Serial number" version="7.0">
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -85,7 +86,7 @@
                     </group>
                     <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="name" string="Lots"/>
+                            <field name="name" string="Serial Number"/>
                             <field name="quantity" />
                         </tree>
                         <form string="Serial Number" version="7.0">
@@ -97,12 +98,12 @@
                     </field>
                     <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
+                            <field name="prodlot_id" string="Serial Number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
                             <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
+                                <field name="prodlot_id" string="Serial Number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
                                 <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
                             </group>
                         </form>
@@ -115,7 +116,7 @@
             </record>
 
             <record id="track_line" model="ir.actions.act_window">
-                <field name="name">Split in lots</field>
+                <field name="name">Split in serial numbers</field>
                 <field name="type">ir.actions.act_window</field>
                 <field name="res_model">stock.move.split</field>
                 <field name="view_type">form</field>