diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index c61b185..5dca6cd 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -18,10 +18,13 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="period_at"/>
                 <label name="concentration"/>
                 <field name="concentration"/>
+                <newline/>
+                <label name="attributes_name"/>
+                <field name="attributes_name" colspan="9"/>
             </group>
             <group id="left_column" colspan="6" col="1"
                 col_widths="1fr">
-                <group id="quantities" string="1. Quantities &amp; Unit"
+                <group id="quantities" string="Quantities &amp; Unit"
                     colspan="1" col="4" panel="card" icon="tryton-archive"
                     col_widths="min-content,1fr,min-content,1fr">
                     <label name="quantity_theorical"/>
@@ -32,18 +35,10 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="targeted_qt" width="120" xexpand="0" xfill="0" xalign="0"/>
                     <label name="unit"/>
                     <field name="unit"/>
-                    <newline/>
-                    <label name="tol_min_qt"/>
-                    <field name="tol_min_qt"/>
-                    <label name="tol_max_qt"/>
-                    <field name="tol_max_qt"/>
                 </group>
-                <group id="tolerances" string="4. Tolerances &amp; Inheritance"
+                <group id="tolerances" string="Tolerances &amp; Inheritance"
                     colspan="1" col="6" panel="card" icon="tryton-switch"
                     col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
-                    <label name="progress"/>
-                    <field name="progress" widget="progressbar" colspan="5"/>
-                    <newline/>
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
                     <label name="inherit_cer"/>
@@ -53,6 +48,12 @@ this repository contains the full copyright notices and license terms. -->
                     <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"
@@ -67,7 +68,7 @@ this repository contains the full copyright notices and license terms. -->
             </group>
             <group id="right_column" colspan="6" col="1"
                 col_widths="1fr">
-                <group id="dates" string="2. Dates"
+                <group id="dates" string="Dates"
                     colspan="1" col="9" panel="card" icon="tryton-date"
                     col_widths="min-content,1fr,min-content,min-content,1fr,min-content,1fr,min-content,min-content">
                     <label id="delivery_date" string="Delivery Date:"/>
@@ -80,19 +81,22 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="finished"/>
                     <field name="finished"/>
                 </group>
-                <group id="pricing_amounts" string="3. Pricing &amp; Amounts"
+                <group id="pricing_amounts" string="Pricing &amp; Amounts"
                     colspan="1" col="6" panel="card" icon="tryton-public"
                     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"/>
+                    <field name="unit_price" width="120" xexpand="0" xfill="0"/>
                     <label name="premium"/>
-                    <field name="premium"/>
+                    <field name="premium" width="120" xexpand="0" xfill="0"/>
+                    <newline/>
                     <label name="amount"/>
-                    <field name="amount" colspan="3"/>
+                    <field name="amount" width="160" xexpand="0" xfill="0"/>
+                    <label name="progress"/>
+                    <field name="progress" widget="progressbar" colspan="3"/>
                 </group>
-                <group id="currencies_links" string="5. Currencies &amp; Links"
+                <group id="currencies_links" string="Currencies &amp; Links"
                     colspan="1" col="4" panel="card" icon="tryton-link"
                     col_widths="min-content,1fr,min-content,1fr">
                     <label name="enable_linked_currency"/>
@@ -108,16 +112,10 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
             </group>
             <group id="attributes_description" string="Description"
-                colspan="6" col="1" panel="card" icon="tryton-note"
+                colspan="12" col="1" panel="card" icon="tryton-note"
                 col_widths="1fr">
                 <field name="description"/>
             </group>
-            <group id="attributes" string="Attributes"
-                colspan="6" col="2" panel="card" icon="tryton-filter"
-                col_widths="min-content,1fr">
-                <label name="attributes_name"/>
-                <field name="attributes_name"/>
-            </group>
         </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='general']" position="after">
diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index 29d68c7..1cda550 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -2,67 +2,115 @@
 <!-- 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"/>
+    <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"
+                col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr">
+                <label name="product"/>
+                <field name="product"/>
+                <label name="del_period"/>
+                <field name="del_period"/>
+                <label name="period_at"/>
+                <field name="period_at"/>
+                <label name="concentration"/>
+                <field name="concentration"/>
+                <newline/>
+                <label name="attributes_name"/>
+                <field name="attributes_name" colspan="7"/>
+            </group>
+            <group id="left_column" colspan="6" col="1"
+                col_widths="1fr">
+                <group id="quantities" string="Quantities &amp; Unit"
+                    colspan="1" col="4" panel="card" icon="tryton-archive"
+                    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"/>
+                </group>
+                <group id="tolerances" string="Tolerances &amp; Inheritance"
+                    colspan="1" col="6" panel="card" icon="tryton-switch"
+                    col_widths="min-content,1fr,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"/>
+                    <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"
+                col_widths="1fr">
+                <group id="dates" string="Dates"
+                    colspan="1" col="5" panel="card" icon="tryton-date"
+                    col_widths="min-content,1fr,min-content,1fr,min-content">
+                    <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="Pricing &amp; Amounts"
+                    colspan="1" col="6" panel="card" icon="tryton-public"
+                    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" width="120" xexpand="0" xfill="0"/>
+                    <label name="premium"/>
+                    <field name="premium" width="120" xexpand="0" xfill="0"/>
+                    <newline/>
+                    <label name="amount"/>
+                    <field name="amount" width="160" xexpand="0" xfill="0"/>
+                    <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"
+                    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" colspan="3"/>
+                </group>
+            </group>
+            <group id="description" string="Description"
+                colspan="12" col="1" panel="card" icon="tryton-note"
+                col_widths="1fr">
+                <field name="description"/>
+            </group>
+        </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Fees" col="4" id="fees">