diff --git a/modules/purchase_trade/view/purchase_form.xml b/modules/purchase_trade/view/purchase_form.xml
index 47bffad..ce01bfd 100755
--- a/modules/purchase_trade/view/purchase_form.xml
+++ b/modules/purchase_trade/view/purchase_form.xml
@@ -39,24 +39,20 @@ this repository contains the full copyright notices and license terms. -->
                 xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="purchase_commercial_terms_top"
-                    colspan="1" col="6" xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,130px">
+                    colspan="1" col="4" xalign="0" yalign="0"
+                    col_widths="min-content,1fr,min-content,1fr">
                     <label name="payment_term"/>
                     <field name="payment_term"/>
                     <label name="wb"/>
                     <field name="wb"/>
-                    <label name="lc_date"/>
-                    <field name="lc_date"/>
                 </group>
                 <group id="purchase_commercial_terms_incoterm"
-                    colspan="1" col="6" xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    colspan="1" col="4" xalign="0" yalign="0"
+                    col_widths="min-content,1fr,min-content,1fr">
                     <label name="incoterm"/>
                     <field name="incoterm"/>
                     <label name="incoterm_location"/>
                     <field name="incoterm_location"/>
-                    <label name="certif"/>
-                    <field name="certif"/>
                 </group>
                 <group id="purchase_commercial_terms_tolerance"
                     colspan="1" col="8" xalign="0" yalign="0"
@@ -100,6 +96,10 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="association"/>
                 <label name="crop"/>
                 <field name="crop"/>
+                <label name="lc_date"/>
+                <field name="lc_date"/>
+                <label name="certif"/>
+                <field name="certif"/>
             </group>
 
         </group>
diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index c190c33..cfe6536 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -63,6 +63,36 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="coffee_packing_unit"/>
                     <label name="coffee_packing_description"/>
                     <field name="coffee_packing_description"/>
+                    <newline/>
+                    <label name="inherit_tol"/>
+                    <field name="inherit_tol"/>
+                    <label name="inherit_cer"/>
+                    <field name="inherit_cer"/>
+                    <newline/>
+                    <label name="certif"/>
+                    <field name="certif" colspan="3"/>
+                    <newline/>
+                    <label name="tol_min"/>
+                    <field name="tol_min"/>
+                    <label name="tol_max"/>
+                    <field name="tol_max"/>
+                    <newline/>
+                    <label name="tol_min_qt"/>
+                    <field name="tol_min_qt"/>
+                    <label name="tol_max_qt"/>
+                    <field name="tol_max_qt"/>
+                    <newline/>
+                    <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" colspan="3"/>
+                    <newline/>
+                    <label name="tol_min_v"/>
+                    <field name="tol_min_v"/>
+                    <label name="tol_max_v"/>
+                    <field name="tol_max_v"/>
+                    <field name="tolerance_min" invisible="1" colspan="4"/>
+                    <field name="tolerance_max" invisible="1" colspan="4"/>
                 </group>
             </group>
             <group id="line_top_right" colspan="6" col="1"
@@ -110,57 +140,12 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="linked_unit"/>
                     <label name="linked_price"/>
                     <field name="linked_price"/>
-                </group>
-            </group>
-            <group id="line_links_market_left" colspan="6" col="1"
-                xalign="0" yalign="0"
-                col_widths="1fr">
-                <group id="tolerances" string="Tolerances &amp; Inheritance"
-                    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"/>
-                    <field name="inherit_cer"/>
                     <newline/>
-                    <label name="certif"/>
-                    <field name="certif" colspan="3"/>
-                    <newline/>
-                    <label name="tol_min"/>
-                    <field name="tol_min"/>
-                    <label name="tol_max"/>
-                    <field name="tol_max"/>
-                    <newline/>
-                    <label name="tol_min_qt"/>
-                    <field name="tol_min_qt"/>
-                    <label name="tol_max_qt"/>
-                    <field name="tol_max_qt"/>
-                    <newline/>
-                    <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" colspan="3"/>
-                    <newline/>
-                    <label name="tol_min_v"/>
-                    <field name="tol_min_v"/>
-                    <label name="tol_max_v"/>
-                    <field name="tol_max_v"/>
-                    <field name="tolerance_min" invisible="1" colspan="4"/>
-                    <field name="tolerance_max" invisible="1" colspan="4"/>
-                </group>
-            </group>
-            <group id="line_links_market_right" colspan="6" col="1"
-                xalign="0" yalign="0"
-                col_widths="1fr">
-                <group id="coffee_market_price" string="Market price"
-                    colspan="1" col="4" panel="card" icon="tradon-price"
-                    xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
                     <label name="coffee_market_reference"/>
                     <field name="coffee_market_reference"/>
                     <label name="coffee_market_price"/>
                     <field name="coffee_market_price" width="120" xexpand="0" xfill="0"/>
+                    <newline/>
                     <label name="coffee_market_delta"/>
                     <field name="coffee_market_delta" width="120" xexpand="0" xfill="0"/>
                 </group>