diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index 6c07914..de96438 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0"?>
 <!-- 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>
+<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">
-            <group id="identity" colspan="12" col="8" panel="summary"
+            <group id="identity" colspan="12" col="10" panel="summary"
                 xalign="0" yalign="0"
-                col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr">
+                col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr,min-content,min-content">
                 <label name="product"/>
                 <field name="product"/>
                 <label name="del_period"/>
@@ -16,17 +30,19 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="period_at"/>
                 <label name="concentration"/>
                 <field name="concentration" width="80" xexpand="0" xfill="0"/>
+                <label name="finished"/>
+                <field name="finished" xexpand="0" xfill="0"/>
                 <newline/>
                 <label name="attributes_name"/>
-                <field name="attributes_name" colspan="7"/>
+                <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"
+                    colspan="1" col="8" panel="card" icon="tryton-archive"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
                     <label name="quantity_theorical"/>
                     <field name="quantity_theorical"/>
                     <label name="quantity"/>
@@ -36,41 +52,31 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="unit"/>
                     <field name="unit"/>
                 </group>
-                <group id="coffee_packing" string="Packing"
-                    colspan="1" col="4" panel="card" icon="tryton-archive"
+                <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">
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
                     <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"/>
-                    <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">
+                    <newline/>
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
                     <label name="inherit_cer"/>
                     <field name="inherit_cer"/>
+                    <label name="certif"/>
+                    <field name="certif"/>
                     <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"/>
+                    <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" colspan="3"/>
-                    <newline/>
+                        width="180" xexpand="0" xfill="0" xalign="0"/>
                     <label name="tol_min_v"/>
                     <field name="tol_min_v"/>
                     <label name="tol_max_v"/>
@@ -90,18 +96,17 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="from_del" width="120" xexpand="0" xfill="0"/>
                     <label name="to_del"/>
                     <field name="to_del" width="120" xexpand="0" xfill="0"/>
-                    <newline/>
-                    <label name="finished"/>
-                    <field name="finished" xexpand="0" xfill="0"/>
                 </group>
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
-                    colspan="1" col="4" panel="card" icon="tryton-public"
+                    colspan="1" col="6" panel="card" icon="tryton-public"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
+                    col_widths="min-content,1fr,min-content,1fr,min-content,min-content">
                     <label name="price_type"/>
                     <field name="price_type"/>
                     <label name="unit_price"/>
                     <field name="unit_price" width="150" xexpand="0" xfill="0"/>
+                    <label name="enable_linked_currency"/>
+                    <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="premium"/>
                     <field name="premium" width="120" xexpand="0" xfill="0"/>
@@ -109,14 +114,8 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="amount" width="160" xexpand="0" xfill="0"/>
                     <newline/>
                     <label name="progress"/>
-                    <field name="progress" widget="progressbar" colspan="3"/>
-                </group>
-                <group id="currencies_links" string="Currencies &amp; Links"
-                    colspan="1" col="4" panel="card" icon="tryton-link"
-                    xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
-                    <label name="enable_linked_currency"/>
-                    <field name="enable_linked_currency" xexpand="0" xfill="0"/>
+                    <field name="progress" widget="progressbar" colspan="5"/>
+                    <newline/>
                     <label name="linked_currency"/>
                     <field name="linked_currency"/>
                     <newline/>
@@ -125,21 +124,29 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="linked_price"/>
                     <field name="linked_price"/>
                     <newline/>
-                    <label name="certif"/>
-                    <field name="certif" colspan="3"/>
-                </group>
-                <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>
             </group>
+            <group id="line_fees" string="Fees"
+                colspan="12" col="1" panel="card" icon="tryton-list"
+                xalign="0" yalign="0"
+                col_widths="1fr">
+                <field name="fees" colspan="1" mode="tree,form" height="180"
+                    view_ids="purchase_trade.fee_view_tree_sequence,purchase_trade.fee_view_form"/>
+                <button name="apply_default_fees" icon="tryton-launch"/>
+            </group>
+            <group id="line_pricing" string="Pricing"
+                colspan="12" col="1" panel="card" icon="tryton-public"
+                xalign="0" yalign="0"
+                col_widths="1fr">
+                <field name="price_pricing" colspan="1" height="180"/>
+            </group>
             <group id="description" string="Description"
                 colspan="12" col="1" panel="card" icon="tryton-note"
                 xalign="0" yalign="0"
@@ -197,10 +204,6 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="coffee_samples" colspan="1" mode="tree,form" view_ids="purchase_trade.coffee_sample_view_tree,purchase_trade.coffee_sample_view_form"/>
             </group>
         </page>
-        <page string="Fees" col="4" id="fees">
-            <button name="apply_default_fees" icon="tryton-launch"/>
-            <field name="fees" colspan="4" view_ids="purchase_trade.fee_view_tree_sequence"/>
-        </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='commissions']" position="after">
         <page string="Charter Conditions" id="charter_conditions">
@@ -218,9 +221,6 @@ this repository contains the full copyright notices and license terms. -->
                 <page string="Components" col="4" id="components">
                     <field name="price_components" mode="tree,form" view_ids="purchase_trade.component_view_tree_sequence2,purchase_trade.component_view_form2"/> 
                 </page>
-                <page string="Pricing dates" col="4" id="pricing_date">
-                    <field name="price_pricing" />
-                </page>
                 <page string="Summary" col="4" id="summary">
                     <field name="price_summary" />
                 </page>