diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index aeb13ee..a660e69 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -6,6 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <page string="General" id="general" col="12"
             col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
             <group id="identity" colspan="12" col="10" panel="summary"
+                xalign="0" yalign="0"
                 col_widths="min-content,2fr,min-content,1.2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr">
                 <label name="product"/>
                 <field name="product"
@@ -23,9 +24,11 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="attributes_name" colspan="9"/>
             </group>
             <group id="left_column" colspan="6" col="1"
+                xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="quantities" string="Quantities &amp; Unit"
                     colspan="1" col="4" panel="card" icon="tryton-archive"
+                    xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr">
                     <label name="quantity_theorical"/>
                     <field name="quantity_theorical"/>
@@ -37,8 +40,9 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="unit"/>
                 </group>
                 <group id="tolerances" string="Tolerances &amp; Inheritance"
-                    colspan="1" col="6" panel="card" icon="tryton-switch"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    colspan="1" col="4" panel="card" icon="tryton-switch"
+                    xalign="0" yalign="0"
+                    col_widths="min-content,1fr,min-content,1fr">
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
                     <label name="inherit_cer"/>
@@ -57,7 +61,8 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="tolerance_used"/>
                     <field name="tolerance_used" widget="tolerance_gauge"
                         min_field="tolerance_min" max_field="tolerance_max"
-                        width="180" xexpand="0" xfill="0" xalign="0"/>
+                        width="180" xexpand="0" xfill="0" xalign="0" colspan="3"/>
+                    <newline/>
                     <label name="tol_min_v"/>
                     <field name="tol_min_v"/>
                     <label name="tol_max_v"/>
@@ -67,9 +72,11 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
             </group>
             <group id="right_column" colspan="6" col="1"
+                xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="dates" string="Dates"
                     colspan="1" col="9" panel="card" icon="tryton-date"
+                    xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,min-content,1fr,min-content,1fr,min-content,min-content">
                     <label id="delivery_date" string="Delivery Date:"/>
                     <field name="delivery_date"/>
@@ -83,6 +90,7 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
                     colspan="1" col="6" panel="card" icon="tryton-public"
+                    xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
                     <label name="price_type"/>
                     <field name="price_type"/>
@@ -98,7 +106,8 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
                 <group id="currencies_links" string="Currencies &amp; Links"
                     colspan="1" col="2" panel="card" icon="tryton-link"
-                    col_widths="min-content,minmax(0,1fr)">
+                    xalign="0" yalign="0"
+                    col_widths="min-content,1fr">
                     <label name="enable_linked_currency"/>
                     <field name="enable_linked_currency"/>
                     <newline/>
@@ -117,6 +126,7 @@ this repository contains the full copyright notices and license terms. -->
             </group>
             <group id="attributes_description" string="Description"
                 colspan="12" col="1" panel="card" icon="tryton-note"
+                xalign="0" yalign="0"
                 col_widths="1fr">
                 <field name="description"/>
             </group>
diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index e881597..66859cf 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -6,6 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <page string="General" id="general" col="12"
             col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
             <group id="identity" colspan="12" col="8" panel="summary"
+                xalign="0" yalign="0"
                 col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr">
                 <label name="product"/>
                 <field name="product"/>
@@ -20,9 +21,11 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="attributes_name" colspan="7"/>
             </group>
             <group id="left_column" colspan="6" col="1"
+                xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="quantities" string="Quantities &amp; Unit"
                     colspan="1" col="4" panel="card" icon="tryton-archive"
+                    xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr">
                     <label name="quantity_theorical"/>
                     <field name="quantity_theorical"/>
@@ -34,8 +37,9 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="unit"/>
                 </group>
                 <group id="tolerances" string="Tolerances &amp; Inheritance"
-                    colspan="1" col="6" panel="card" icon="tryton-switch"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    colspan="1" col="4" panel="card" icon="tryton-switch"
+                    xalign="0" yalign="0"
+                    col_widths="min-content,1fr,min-content,1fr">
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
                     <label name="inherit_cer"/>
@@ -54,7 +58,8 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="tolerance_used"/>
                     <field name="tolerance_used" widget="tolerance_gauge"
                         min_field="tolerance_min" max_field="tolerance_max"
-                        width="180" xexpand="0" xfill="0" xalign="0"/>
+                        width="180" xexpand="0" xfill="0" xalign="0" colspan="3"/>
+                    <newline/>
                     <label name="tol_min_v"/>
                     <field name="tol_min_v"/>
                     <label name="tol_max_v"/>
@@ -64,9 +69,11 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
             </group>
             <group id="right_column" colspan="6" col="1"
+                xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="dates" string="Dates"
                     colspan="1" col="5" panel="card" icon="tryton-date"
+                    xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr,min-content">
                     <label name="from_del"/>
                     <field name="from_del"/>
@@ -77,6 +84,7 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
                     colspan="1" col="6" panel="card" icon="tryton-public"
+                    xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
                     <label name="price_type"/>
                     <field name="price_type"/>
@@ -92,7 +100,8 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
                 <group id="currencies_links" string="Currencies &amp; Links"
                     colspan="1" col="2" panel="card" icon="tryton-link"
-                    col_widths="min-content,minmax(0,1fr)">
+                    xalign="0" yalign="0"
+                    col_widths="min-content,1fr">
                     <label name="enable_linked_currency"/>
                     <field name="enable_linked_currency"/>
                     <newline/>
@@ -111,6 +120,7 @@ this repository contains the full copyright notices and license terms. -->
             </group>
             <group id="description" string="Description"
                 colspan="12" col="1" panel="card" icon="tryton-note"
+                xalign="0" yalign="0"
                 col_widths="1fr">
                 <field name="description"/>
             </group>