diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index edd64a431f4..0346b75dbe2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -22,64 +22,61 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
-                    <sheet>
-                        <group col="4" name="general">
-                            <field name="name"/>
-                            <field name="partner_id"/>
-                            <field name="product_id"/>
-                            <field name="active"/>
-                            <group string="Pricing Information">
-                                <group>
-                                    <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                                    <label for="free_if_more_than"/>
-                                    <div>
-                                        <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                                        <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
-                                    </div>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="use_detailed_pricelist"/>
+                    <group col="4" name="general">
+                        <field name="name"/>
+                        <field name="partner_id"/>
+                        <field name="product_id"/>
+                        <field name="active"/>
+                        <group string="Pricing Information">
+                            <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                            <label for="free_if_more_than"/>
+                            <div>
+                                <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                            </div>
                         </group>
-                        <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
-                            <tree string="Delivery grids">
-                                  <field name="sequence"/>
-                                  <field name="name"/>
-                            </tree>
-                            <form string="Delivery grids" version="7.0">
-                                 <group>
+                        <newline/>
+                        <field name="use_detailed_pricelist"/>
+                    </group>
+                    <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
+                        <tree string="Delivery grids">
+                              <field name="sequence"/>
+                              <field name="name"/>
+                        </tree>
+                        <form string="Delivery grids" version="7.0">
+                             <group>
+                                <group>
+                                    <field name="name"/>
+                                </group>
+                                <group>
+                                    <field name="active"/>
+                                    <field name="sequence"/>
+                                </group>
+                             </group>
+                             <notebook>
+                                <page string="Grid definition">
+                                   <field name="line_ids"/>
+                                </page>
+                                <page string="Destination">
                                     <group>
-                                        <field name="name"/>
-                                    </group>
-                                    <group>
-                                        <field name="active"/>
-                                        <field name="sequence"/>
-                                    </group>
-                                 </group>
-                                 <notebook>
-                                    <page string="Grid definition">
-                                       <field name="line_ids"/>
-                                    </page>
-                                    <page string="Destination">
                                         <group>
-                                            <group>
-                                                <field name="country_ids" widget="many2many_tags"/>
-                                                <field name="state_ids" widget="many2many_tags"/>
-                                            </group>
-                                            <group>
-                                                <label for="zip_from" string="Zip"/>
-                                                <div>
-                                                    <field name="zip_from" class="oe_inline"/>
-                                                    -
-                                                    <field name="zip_to" class="oe_inline"/>
-                                                </div>
-                                            </group>
+                                            <field name="country_ids" widget="many2many_tags"/>
+                                            <field name="state_ids" widget="many2many_tags"/>
                                         </group>
-                                    </page>
-                                </notebook>
-                            </form>
-                       </field>
-                    </sheet>
+                                        <group>
+                                            <label for="zip_from" string="Zip"/>
+                                            <div>
+                                                <field name="zip_from" class="oe_inline"/>
+                                                -
+                                                <field name="zip_to" class="oe_inline"/>
+                                            </div>
+                                        </group>
+                                    </group>
+                                </page>
+                            </notebook>
+                        </form>
+                   </field>
+
                 </form>
             </field>
         </record>
@@ -170,7 +167,7 @@
                     </group>
                 </form>
             </field>
-        </record>
+        </record>delivery.carrier
         <record id="view_delivery_grid_line_tree" model="ir.ui.view">
             <field name="name">delivery.grid.line.tree</field>
             <field name="model">delivery.grid.line</field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fcf4992ed2a..c791f61b2a3 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -65,18 +65,18 @@
                     <h2>
                         <field name="message"/>
                     </h2>
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2">
+                    <group>
+                        <group>
                             <field name="date_planned"/>
                             <field name="procure_method"/>
                             <field name="priority"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
-                        <group col="2" colspan="2"/>
+                        <group/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
-                        <group col="4">
+                        <group>
                             <group>
                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
                                 <label for="product_qty"/>
@@ -84,7 +84,7 @@
                                     <field name="product_qty" class="oe_inline"/>
                                     <field name="product_uom" class="oe_inline"/>
                                 </div>
-                                <label for="product_uos_qty" string="Quentity UoS"/>
+                                <label for="product_uos_qty" string="Quentity UoS" groups="product.group_uos"/>
                                 <div>
                                     <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
                                     <field name="product_uos"  groups="product.group_uos" class="oe_inline"/>
@@ -96,7 +96,7 @@
                         </group>
                     </page>
                     <page string="Extra Information">
-                        <group string="Details" col="4">
+                        <group string="Details">
                             <field name="move_id"/>
                             <field name="date_close"/>
                             <field name="close_move"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b44e197ceec..41b2439c0b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -227,6 +227,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packs" version="7.0">
+                    <div groups="stock.group_tracking_lot" class="oe_button_box">
+                        <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"/>
+                        <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                        context="{'type': 'move_history_ids'}"/>
+                    </div>
                     <group>
                         <group groups="product.group_stock_packaging" string="Pack Identification">
                             <field name="name"/>
@@ -234,12 +239,6 @@
                             <field name="date"/>
                             <field name="active"/>
                         </group>
-                        <group groups="stock.group_tracking_lot" string="Traceability">
-                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
-                                 colspan="2"/>
-                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
-                                context="{'type': 'move_history_ids'}" colspan="2"/>
-                        </group>
                     </group>
                     <field name="move_ids"/>
                 </form>
@@ -338,46 +337,44 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <sheet>
-                        <group>
-                            <group string="Serial Number Identification">
-                                <field name="product_id"/>
-                                <field name="prefix"/>
-                                <field name="name"/>
-                                <field name="ref"/>
-                                <group string="Dates">
-                                    <field name="date"/>
-                                </group>
-                            </group>
-                            <group string="Traceability">
-                                <field name="stock_available"/>
-                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+                    <group>
+                        <group string="Serial Number Identification">
+                            <field name="product_id"/>
+                            <field name="prefix"/>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <group string="Dates">
+                                <field name="date"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Revisions">
-                                <field name="revisions"/>
-                            </page>
-                            <page string="Stock Moves">
-                                <field name="move_ids">
-                                    <tree  string="Stock Moves">
-                                        <field name="picking_id" string="Reference"/>
-                                        <field name="origin"/>
-                                        <field name="product_id"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                        <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                        <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                        <field name="date"/>
-                                        <field name="prodlot_id"/>
-                                        <field name="location_id" groups="stock.group_locations"/>
-                                        <field name="location_dest_id" groups="stock.group_locations"/>
-                                        <field name="state"/>
-                                    </tree>
-                                 </field>
-                            </page>
-                        </notebook>
-                    </sheet>
+                        <group string="Traceability">
+                            <field name="stock_available"/>
+                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Revisions">
+                            <field name="revisions"/>
+                        </page>
+                        <page string="Stock Moves">
+                            <field name="move_ids">
+                                <tree  string="Stock Moves">
+                                    <field name="picking_id" string="Reference"/>
+                                    <field name="origin"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="tracking_id" groups="stock.group_tracking_lot"/>
+                                    <field name="date"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id" groups="stock.group_locations"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
+                                    <field name="state"/>
+                                </tree>
+                             </field>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -523,41 +520,39 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
-                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="location_id" class="oe_edit_only"/>
-                        <h2><field name="location_id"/></h2>
-                        <group>
-                            <group string="Additional Information">
-                                <field name="usage"/>
-                                <field name="partner_id"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="icon"/>
-                                <field name="scrap_location"/>
-                                <field name="active"/>
-                            </group>
-                            <group string="Chained Locations">
-                                <field name="chained_location_type"/>
-                                <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
-                                <field name="chained_auto_packing"/>
-                                <field name="chained_delay"/>
-                                <field name="chained_journal_id"/>
-                                <field name="chained_picking_type"/>
-                                <field name="chained_company_id" widget="selection"/>
-                            </group>
-                            <group string="Localization">
-                                <field name="posx"/>
-                                <field name="posy"/>
-                                <field name="posz"/>
-                            </group><group string="Accounting Information">
-                                <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                                <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                            </group>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name"/></h1>
+                    <label for="location_id" class="oe_edit_only"/>
+                    <h2><field name="location_id"/></h2>
+                    <group>
+                        <group string="Additional Information">
+                            <field name="usage"/>
+                            <field name="partner_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="icon"/>
+                            <field name="scrap_location"/>
+                            <field name="active"/>
                         </group>
-                        <separator string="Additional Information"/>
-                        <field name="comment"/>
-                    </sheet>
+                        <group string="Chained Locations">
+                            <field name="chained_location_type"/>
+                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                            <field name="chained_auto_packing"/>
+                            <field name="chained_delay"/>
+                            <field name="chained_journal_id"/>
+                            <field name="chained_picking_type"/>
+                            <field name="chained_company_id" widget="selection"/>
+                        </group>
+                        <group string="Localization">
+                            <field name="posx"/>
+                            <field name="posy"/>
+                            <field name="posz"/>
+                        </group><group string="Accounting Information">
+                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                        </group>
+                    </group>
+                    <separator string="Additional Information"/>
+                    <field name="comment"/>
                 </form>
             </field>
         </record>