diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py
index 9738e4d..25f507a 100755
--- a/modules/purchase_trade/purchase.py
+++ b/modules/purchase_trade/purchase.py
@@ -2691,7 +2691,7 @@ class Line(metaclass=PoolMeta):
     tol_max_qt = fields.Numeric("Tol +",states={
             'readonly': (Eval('inherit_tol')),
             })
-    inherit_tol = fields.Boolean("Inh.")
+    inherit_tol = fields.Boolean("Inh. tol.")
     tol_min_v = fields.Function(fields.Numeric("Qt min"),'get_tol_min')
     tol_max_v = fields.Function(fields.Numeric("Qt max"),'get_tol_max')
     tolerance_used = fields.Function(
@@ -2706,7 +2706,7 @@ class Line(metaclass=PoolMeta):
     #     ('bci', 'BCI'),
     # ],"Certification",states={'readonly': (Eval('inherit_cer')),})
     certif = fields.Many2One('purchase.certification',"Certification",states={'readonly': (Eval('inherit_cer')),})
-    inherit_cer = fields.Boolean("Inh.")
+    inherit_cer = fields.Boolean("Inh. cert.")
     enable_linked_currency = fields.Boolean("Linked currencies")
     linked_price = fields.Numeric("Price", digits='unit',states={
             'invisible': (~Eval('enable_linked_currency')),
diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py
index 8b0b58f..6f657a8 100755
--- a/modules/purchase_trade/sale.py
+++ b/modules/purchase_trade/sale.py
@@ -2490,7 +2490,7 @@ class SaleLine(metaclass=PoolMeta):
     tol_max_qt = fields.Numeric("Tol +",states={
             'readonly': (Eval('inherit_tol')),
             })
-    inherit_tol = fields.Boolean("Inh.")
+    inherit_tol = fields.Boolean("Inh. tol.")
     tol_min_v = fields.Function(fields.Numeric("Qt min"),'get_tol_min')
     tol_max_v = fields.Function(fields.Numeric("Qt max"),'get_tol_max')
     tolerance_used = fields.Function(
@@ -2505,7 +2505,7 @@ class SaleLine(metaclass=PoolMeta):
     #     (None, ''),
     #     ('bci', 'BCI'),
     # ],"Certification",states={'readonly': (Eval('inherit_cer')),})
-    inherit_cer = fields.Boolean("Inh.")
+    inherit_cer = fields.Boolean("Inh. cert.")
     enable_linked_currency = fields.Boolean("Linked currencies")
     linked_price = fields.Numeric("Price", digits='unit',states={
             'invisible': (~Eval('enable_linked_currency')),
diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index fe3dd76..8f64d46 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -19,9 +19,9 @@ this repository contains the full copyright notices and license terms. -->
     <xpath expr="/form/notebook/page[@id='general']" position="replace">
         <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"
+            <group id="identity" colspan="12" col="12" panel="summary"
                 xalign="0" yalign="0"
-                col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr,min-content,min-content">
+                col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,120px,min-content,120px,min-content,min-content">
                 <label name="product"/>
                 <field name="product"
                     view_ids="purchase.product_view_list_purchase_line"/>
@@ -66,11 +66,11 @@ this repository contains the full copyright notices and license terms. -->
                 <group id="coffee_packing" string="Packing &amp; Tolerance"
                     colspan="1" col="6" panel="card" icon="tryton-archive"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    col_widths="min-content,130px,min-content,150px,min-content,130px">
                     <label name="coffee_packing_count"/>
                     <field name="coffee_packing_count" width="120" xexpand="0" xfill="0"/>
                     <label name="coffee_packing_unit"/>
-                    <field name="coffee_packing_unit"/>
+                    <field name="coffee_packing_unit" width="150" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
@@ -87,11 +87,11 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="tolerance_used" string="Tol. 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="160" xexpand="0" xfill="0" xalign="0"/>
                     <label name="tol_min_v"/>
-                    <field name="tol_min_v"/>
+                    <field name="tol_min_v" width="90" xexpand="0" xfill="0"/>
                     <label name="tol_max_v"/>
-                    <field name="tol_max_v"/>
+                    <field name="tol_max_v" width="90" xexpand="0" xfill="0"/>
                     <field name="tolerance_min" invisible="1" colspan="4"/>
                     <field name="tolerance_max" invisible="1" colspan="4"/>
                 </group>
@@ -102,7 +102,7 @@ this repository contains the full copyright notices and license terms. -->
                 <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">
+                    col_widths="min-content,130px,min-content,150px,min-content,130px">
                     <label name="price_type"/>
                     <field name="price_type"/>
                     <label name="unit_price"/>
@@ -112,16 +112,16 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="linked_currency"/>
-                    <field name="linked_currency"/>
+                    <field name="linked_currency" width="130" xexpand="0" xfill="0"/>
                     <label name="linked_unit"/>
-                    <field name="linked_unit"/>
+                    <field name="linked_unit" width="130" xexpand="0" xfill="0"/>
                     <label name="linked_price"/>
-                    <field name="linked_price"/>
+                    <field name="linked_price" width="110" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="premium"/>
                     <field name="premium" width="120" xexpand="0" xfill="0"/>
                     <label name="amount"/>
-                    <field name="amount" width="160" xexpand="0" xfill="0"/>
+                    <field name="amount" width="150" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="coffee_market_reference"/>
                     <field name="coffee_market_reference"/>
diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index 8ca6366..515b618 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -63,11 +63,11 @@ this repository contains the full copyright notices and license terms. -->
                 <group id="coffee_packing" string="Packing &amp; Tolerance"
                     colspan="1" col="6" panel="card" icon="tryton-archive"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    col_widths="min-content,130px,min-content,150px,min-content,130px">
                     <label name="coffee_packing_count"/>
                     <field name="coffee_packing_count" width="120" xexpand="0" xfill="0"/>
                     <label name="coffee_packing_unit"/>
-                    <field name="coffee_packing_unit"/>
+                    <field name="coffee_packing_unit" width="150" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
@@ -84,11 +84,11 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="tolerance_used" string="Tol. 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="160" xexpand="0" xfill="0" xalign="0"/>
                     <label name="tol_min_v"/>
-                    <field name="tol_min_v"/>
+                    <field name="tol_min_v" width="90" xexpand="0" xfill="0"/>
                     <label name="tol_max_v"/>
-                    <field name="tol_max_v"/>
+                    <field name="tol_max_v" width="90" xexpand="0" xfill="0"/>
                     <field name="tolerance_min" invisible="1" colspan="4"/>
                     <field name="tolerance_max" invisible="1" colspan="4"/>
                 </group>
@@ -99,7 +99,7 @@ this repository contains the full copyright notices and license terms. -->
                 <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">
+                    col_widths="min-content,130px,min-content,150px,min-content,130px">
                     <label name="price_type"/>
                     <field name="price_type"/>
                     <label name="unit_price"/>
@@ -109,16 +109,16 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="linked_currency"/>
-                    <field name="linked_currency"/>
+                    <field name="linked_currency" width="130" xexpand="0" xfill="0"/>
                     <label name="linked_unit"/>
-                    <field name="linked_unit"/>
+                    <field name="linked_unit" width="130" xexpand="0" xfill="0"/>
                     <label name="linked_price"/>
-                    <field name="linked_price"/>
+                    <field name="linked_price" width="110" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="premium"/>
                     <field name="premium" width="120" xexpand="0" xfill="0"/>
                     <label name="amount"/>
-                    <field name="amount" width="160" xexpand="0" xfill="0"/>
+                    <field name="amount" width="150" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="coffee_market_reference"/>
                     <field name="coffee_market_reference"/>