diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 0503ec544b1..e0dd016fdd1 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -7,36 +7,88 @@
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Warehouse" version="7.0">
+                <form string="Configure Warehouse" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
+                    <div>
+                        <separator string="Traceability &amp; Logistics"/>
                         <group>
-                            <separator string="Traceability" colspan="2"/>
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                             <separator string="Logistics" colspan="2"/>
-                             <field name="group_stock_multiple_locations"/>
-                             <field name="module_stock_invoice_directly"/>
-                             <field name="module_stock_location"/>
-                             <field name="decimal_precision" class="oe_inline"/>
+                            <label for="id" string="Traceability"/>
+                            <div>
+                                <div>
+                                    <field name="group_stock_production_lot" class="oe_inline"/>
+                                    <label for="group_stock_production_lot"/>
+                                </div>
+                                <div attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
+                                    <field name="module_product_expiry" class="oe_inline"/>
+                                    <label for="module_product_expiry"/>
+                                </div>
+                                <div>
+                                    <field name="group_stock_tracking_lot" class="oe_inline"/>
+                                    <label for="group_stock_tracking_lot"/>
+                                </div>
+                            </div>    
                         </group>
                         <group>
-                            <separator string="Partners" colspan="2"/>
-                            <field name="module_claim_from_delivery"/>
-                            <separator string="Products" colspan="2"/>
-                            <field name="group_stock_packaging"/>
-                            <field name="group_uom"/>
-                            <field name="group_uos"/>
-                            <field name="group_stock_inventory_valuation" class="oe_inline"/>
-                            <field name="group_product_variant"/>
+                            <label for="id" string="Logistics"/>
+                            <div>
+                                <div>
+                                    <field name="group_stock_multiple_locations" class="oe_inline"/>
+                                    <label for="group_stock_multiple_locations"/>  
+                                </div>
+                                <div>
+                                    <field name="module_stock_invoice_directly" class="oe_inline"/>
+                                    <label for="module_stock_invoice_directly"/>
+                                </div>
+                                <div>
+                                    <field name="module_stock_location" class="oe_inline"/>
+                                    <label for="module_stock_location"/>
+                                </div>
+                                <div>
+                                    <label for="decimal_precision"/>
+                                    <field name="decimal_precision" class="oe_inline"/>
+                                </div>
+                             </div>
                         </group>
-                    </group>
+                    </div>
+                    <div>
+                        <separator string="Partners &amp; Products"/>
+                        <group>
+                            <label for="id" string="Partners"/>
+                            <div>
+                                <field name="module_claim_from_delivery" class="oe_inline"/>
+                                <label for="module_claim_from_delivery"/>
+                            </div>
+                        </group>
+                        <group>
+                            <label for="id" string="Products"/>
+                            <div>
+                                <div>
+                                    <field name="group_stock_packaging" class="oe_inline"/>
+                                    <label for="group_stock_packaging"/>
+                                </div>
+                                <div>
+                                    <field name="group_uom" class="oe_inline"/>
+                                    <label for="group_uom"/>
+                                </div>
+                                <div>
+                                    <field name="group_uos" class="oe_inline"/>
+                                    <label for="group_uos" string="Unit of Measure (for Sale)"/>
+                                </div>
+                                <div>
+                                    <field name="group_stock_inventory_valuation" class="oe_inline"/>
+                                    <label for="group_stock_inventory_valuation"/>
+                                </div>
+                                <div>
+                                    <field name="group_product_variant" class="oe_inline"/>
+                                    <label for="group_product_variant"/>
+                                </div>
+                            </div>
+                        </group>
+                    </div>
                 </form>
             </field>
         </record>