diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index 57b23f1..4cddb9e 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -1,68 +1,115 @@
 <?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>
-    <xpath expr="/form/notebook/page[@id='general']/label[@name='quantity']" position="before">
-        <label name="quantity_theorical"/>
-        <field name="quantity_theorical"/>
-        <label name="finished"/>
-        <field name="finished"/>
-        <newline/>
-    </xpath>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='unit']" position="after">
-        <label name="price_type"/>
-        <field name="price_type"/>
-        <label name="enable_linked_currency"/>
-        <field name="enable_linked_currency"/>
-        <newline/>
-        <label name="linked_currency"/>
-        <field name="linked_currency"/>
-        <label name="linked_unit"/>
-        <field name="linked_unit"/>
-        <newline/>
-        <label name="linked_price"/>
-        <field name="linked_price"/>
-        <label name="premium"/>
-        <field name="premium"/>
-        <newline/>
-    </xpath>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='amount']" position="after">
-        <newline/>
-        <label name="progress"/>
-        <field name="progress" widget="progressbar"/>
-        <newline/>
-        <label name="inherit_tol"/>
-        <field name="inherit_tol"/>
-        <newline/>
-        <label name="tol_min"/>
-        <field name="tol_min"/>
-        <label name="tol_min_v"/>
-        <field name="tol_min_v"/>
-        <newline/>
-        <label name="tol_max"/>
-        <field name="tol_max"/>
-        <label name="tol_max_v"/>
-        <field name="tol_max_v"/>
-        <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"/>
-        <label name="targeted_qt"/>
-        <field name="targeted_qt" width="120" xexpand="0" xfill="0" xalign="0"/>
-        <newline/>
-        <label name="tol_min_qt"/>
-        <field name="tol_min_qt"/>
-        <newline/>
-        <label name="tol_max_qt"/>
-        <field name="tol_max_qt"/>
-        <newline/>
-        <label name="inherit_cer"/>
-        <field name="inherit_cer"/>
-        <label name="certif"/>
-        <field name="certif"/>
-        <field name="tolerance_min" invisible="1" colspan="4"/>
-        <field name="tolerance_max" invisible="1" colspan="4"/>
+<data>
+    <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"
+                col_widths="min-content,2fr,min-content,1.2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr">
+                <label name="product"/>
+                <field name="product"
+                    view_ids="purchase.product_view_list_purchase_line"/>
+                <label name="product_supplier"/>
+                <field name="product_supplier"/>
+                <label name="del_period"/>
+                <field name="del_period"/>
+                <label name="period_at"/>
+                <field name="period_at"/>
+                <label name="concentration"/>
+                <field name="concentration"/>
+            </group>
+            <group id="quantities" string="1. Quantities &amp; Unit"
+                colspan="6" col="4"
+                col_widths="min-content,1fr,min-content,1fr">
+                <label name="quantity_theorical"/>
+                <field name="quantity_theorical"/>
+                <label name="quantity"/>
+                <field name="quantity"/>
+                <label name="targeted_qt"/>
+                <field name="targeted_qt" width="120" xexpand="0" xfill="0" xalign="0"/>
+                <label name="unit"/>
+                <field name="unit"/>
+                <separator string="" colspan="4"/>
+                <label name="tol_min_qt"/>
+                <field name="tol_min_qt"/>
+                <label name="tol_max_qt"/>
+                <field name="tol_max_qt"/>
+            </group>
+            <group id="dates" string="2. Dates" colspan="6" col="8"
+                col_widths="min-content,1fr,min-content,min-content,1fr,min-content,1fr,min-content">
+                <label id="delivery_date" string="Delivery Date:"/>
+                <group id="delivery_date" col="-1">
+                    <field name="delivery_date" xexpand="0"/>
+                    <field name="delivery_date_edit" xexpand="0" xalign="0"/>
+                </group>
+                <label name="from_del"/>
+                <field name="from_del"/>
+                <label name="to_del"/>
+                <field name="to_del"/>
+                <label name="finished"/>
+                <field name="finished"/>
+            </group>
+            <group id="pricing_amounts" string="3. Pricing &amp; Amounts"
+                colspan="6" col="6"
+                col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                <label name="price_type"/>
+                <field name="price_type"/>
+                <label name="unit_price"/>
+                <field name="unit_price"/>
+                <label name="premium"/>
+                <field name="premium"/>
+                <label name="amount"/>
+                <field name="amount"/>
+            </group>
+            <group id="currencies_links" string="4. Currencies &amp; Links"
+                colspan="6" col="4"
+                col_widths="min-content,1fr,min-content,1fr">
+                <label name="enable_linked_currency"/>
+                <field name="enable_linked_currency"/>
+                <label name="linked_currency"/>
+                <field name="linked_currency"/>
+                <label name="linked_unit"/>
+                <field name="linked_unit"/>
+                <label name="linked_price"/>
+                <field name="linked_price"/>
+                <label name="certif"/>
+                <field name="certif"/>
+            </group>
+            <group id="tolerances" string="5. Tolerances &amp; Inheritance"
+                colspan="6" col="6"
+                col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                <label name="progress"/>
+                <field name="progress" widget="progressbar"/>
+                <newline/>
+                <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"/>
+                <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"/>
+                <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" colspan="12" col="2"
+                col_widths="min-content,1fr">
+                <label name="attributes_name"/>
+                <field name="attributes_name"/>
+                <separator name="description" colspan="2"/>
+                <field name="description" colspan="2"/>
+            </group>
+        </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Premium composition" col="4" id="premium_composition">