diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index a86b4aa..107479d 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,1.2fr,min-content,1fr,min-content,0.8fr">
+                col_widths="min-content,2fr,min-content,1.2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr,min-content,min-content">
                 <label name="product"/>
                 <field name="product"
                     view_ids="purchase.product_view_list_purchase_line"/>
@@ -33,17 +33,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="9"/>
+                <field name="attributes_name" colspan="11"/>
             </group>
             <group id="line_top_left" 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"/>
@@ -61,9 +63,6 @@ this repository contains the full copyright notices and license terms. -->
                     <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"
-                        states="{'invisible': True}"/>
-                    <field name="coffee_packing_description" invisible="1"/>
                     <newline/>
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
@@ -78,11 +77,6 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="tol_max"/>
                     <field name="tol_max"/>
                     <newline/>
-                    <label name="tol_min_qt" states="{'invisible': True}"/>
-                    <field name="tol_min_qt" invisible="1"/>
-                    <label name="tol_max_qt" states="{'invisible': True}"/>
-                    <field name="tol_max_qt" invisible="1"/>
-                    <newline/>
                     <label name="tolerance_used"/>
                     <field name="tolerance_used" widget="tolerance_gauge"
                         min_field="tolerance_min" max_field="tolerance_max"
@@ -102,18 +96,15 @@ this repository contains the full copyright notices and license terms. -->
                 <group id="dates" string="Dates"
                     colspan="1" col="8" panel="card" icon="tryton-date"
                     xalign="0" yalign="0"
-                    col_widths="min-content,max-content,min-content,1fr,min-content,max-content,min-content,min-content">
-                    <label id="delivery_date" string="Delivery Date:"/>
-                    <field name="delivery_date" width="120" xexpand="0" xfill="0"/>
-                    <field name="delivery_date_edit" xexpand="0" xfill="0" xalign="0"/>
-                    <label string="" colspan="3"/>
-                    <label name="finished"/>
-                    <field name="finished" xexpand="0" xfill="0"/>
-                    <newline/>
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,min-content">
                     <label name="from_del"/>
                     <field name="from_del" width="120" xexpand="0" xfill="0"/>
                     <label name="to_del"/>
                     <field name="to_del" width="120" xexpand="0" xfill="0"/>
+                    <label id="delivery_date" string="Delivery Date:"/>
+                    <field name="delivery_date" width="120" xexpand="0" xfill="0"/>
+                    <label string="" id="delivery_date_edit_label"/>
+                    <field name="delivery_date_edit" xexpand="0" xfill="0" xalign="0"/>
                 </group>
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
                     colspan="1" col="4" panel="card" icon="tryton-public"