diff --git a/modules/purchase_trade/view/purchase_form.xml b/modules/purchase_trade/view/purchase_form.xml
index 7433739..16fea73 100755
--- a/modules/purchase_trade/view/purchase_form.xml
+++ b/modules/purchase_trade/view/purchase_form.xml
@@ -55,20 +55,20 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="lc_date"/>
                 </group>
                 <group id="purchase_commercial_terms_incoterm"
-                    colspan="1" col="4" xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
+                    colspan="1" col="6" xalign="0" yalign="0"
+                    col_widths="min-content,1fr,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_origin"
                     colspan="1" col="4" xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr">
                     <label name="product_origin"/>
                     <field name="product_origin"/>
-                    <label name="certif"/>
-                    <field name="certif"/>
                 </group>
             </group>
 
@@ -93,22 +93,22 @@ this repository contains the full copyright notices and license terms. -->
                 <label name="crop"/>
                 <field name="crop"/>
             </group>
-        </group>
 
-        <group id="purchase_tolerance" string="Tolerance"
-            colspan="6" col="8" panel="card" icon="tryton-switch"
-            xalign="0" yalign="0"
-            col_widths="min-content,1fr,min-content,90px,min-content,90px,min-content,280px">
-            <label name="tolerance_option"/>
-            <field name="tolerance_option"/>
-            <label name="tol_min"/>
-            <field name="tol_min"/>
-            <label name="tol_max"/>
-            <field name="tol_max"/>
-            <label name="tolerance_used"/>
-            <field name="tolerance_used" widget="tolerance_gauge"
-                min_field="tolerance_min" max_field="tolerance_max"
-                width="190" xexpand="0" xfill="0"/>
+            <group id="purchase_tolerance" string="Tolerance"
+                colspan="1" col="6" panel="card" icon="tryton-switch"
+                xalign="0" yalign="0"
+                col_widths="min-content,1fr,min-content,90px,min-content,170px">
+                <label name="tolerance_option"/>
+                <field name="tolerance_option"/>
+                <label name="tol_min"/>
+                <field name="tol_min"/>
+                <label name="tol_max"/>
+                <field name="tol_max"/>
+                <label name="tolerance_used"/>
+                <field name="tolerance_used" widget="tolerance_gauge"
+                    min_field="tolerance_min" max_field="tolerance_max"
+                    colspan="5" width="190" xexpand="0" xfill="0"/>
+            </group>
         </group>
         <field name="tolerance_min" invisible="1"/>
         <field name="tolerance_max" invisible="1"/>
diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index 91a7b89..3d5e98a 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -2,6 +2,20 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
+    <xpath expr="/form/label[@name='type']" position="replace"/>
+    <xpath expr="/form/field[@name='type']" position="replace"/>
+    <xpath expr="/form/label[@name='sequence']" position="replace"/>
+    <xpath expr="/form/field[@name='sequence']" position="replace"/>
+    <xpath expr="/form/notebook" position="after">
+        <group id="line_footer_fields" colspan="4" col="4"
+            xalign="0" yalign="0"
+            col_widths="min-content,1fr,min-content,1fr">
+            <label name="type"/>
+            <field name="type"/>
+            <label name="sequence"/>
+            <field name="sequence"/>
+        </group>
+    </xpath>
     <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">
@@ -23,7 +37,7 @@ this repository contains the full copyright notices and license terms. -->
                 <label name="attributes_name"/>
                 <field name="attributes_name" colspan="9"/>
             </group>
-            <group id="left_column" colspan="6" col="1"
+            <group id="line_top_left" colspan="6" col="1"
                 xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="quantities" string="Quantities &amp; Unit"
@@ -50,39 +64,8 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="coffee_packing_description"/>
                     <field name="coffee_packing_description"/>
                 </group>
-                <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="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="right_column" colspan="6" col="1"
+            <group id="line_top_right" colspan="6" col="1"
                 xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="dates" string="Dates"
@@ -118,6 +101,10 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="progress"/>
                     <field name="progress" widget="progressbar" colspan="3"/>
                 </group>
+            </group>
+            <group id="line_links_market_left" colspan="6" col="1"
+                xalign="0" yalign="0"
+                col_widths="1fr">
                 <group id="currencies_links" string="Currencies &amp; Links"
                     colspan="1" col="4" panel="card" icon="tryton-link"
                     xalign="0" yalign="0"
@@ -135,6 +122,10 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="certif"/>
                     <field name="certif" colspan="3"/>
                 </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"
@@ -147,6 +138,37 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="coffee_market_delta" width="120" xexpand="0" xfill="0"/>
                 </group>
             </group>
+            <group id="tolerances" string="Tolerances &amp; Inheritance"
+                colspan="12" 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="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 id="attributes_description" string="Description"
                 colspan="12" col="1" panel="card" icon="tryton-note"
                 xalign="0" yalign="0"