diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index a660e69..ca80c9e 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -75,53 +75,54 @@ this repository contains the full copyright notices and license terms. -->
                 xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="dates" string="Dates"
-                    colspan="1" col="9" panel="card" icon="tryton-date"
+                    colspan="1" col="4" panel="card" icon="tryton-date"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,min-content,1fr,min-content,1fr,min-content,min-content">
+                    col_widths="min-content,1fr,min-content,1fr">
                     <label id="delivery_date" string="Delivery Date:"/>
                     <field name="delivery_date"/>
                     <field name="delivery_date_edit" xexpand="0" xfill="0" xalign="0"/>
+                    <newline/>
                     <label name="from_del"/>
                     <field name="from_del"/>
                     <label name="to_del"/>
                     <field name="to_del"/>
+                    <newline/>
                     <label name="finished"/>
                     <field name="finished"/>
                 </group>
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
-                    colspan="1" col="6" panel="card" icon="tryton-public"
+                    colspan="1" col="4" panel="card" icon="tryton-public"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    col_widths="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"/>
+                    <newline/>
                     <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"/>
+                    <newline/>
                     <label name="progress"/>
                     <field name="progress" widget="progressbar" colspan="3"/>
                 </group>
                 <group id="currencies_links" string="Currencies &amp; Links"
-                    colspan="1" col="2" panel="card" icon="tryton-link"
+                    colspan="1" col="4" panel="card" icon="tryton-link"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr">
+                    col_widths="min-content,min-content,min-content,1fr">
                     <label name="enable_linked_currency"/>
-                    <field name="enable_linked_currency"/>
-                    <newline/>
+                    <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <label name="linked_currency"/>
                     <field name="linked_currency"/>
                     <newline/>
                     <label name="linked_unit"/>
                     <field name="linked_unit"/>
-                    <newline/>
                     <label name="linked_price"/>
                     <field name="linked_price"/>
                     <newline/>
                     <label name="certif"/>
-                    <field name="certif"/>
+                    <field name="certif" colspan="3"/>
                 </group>
             </group>
             <group id="attributes_description" string="Description"
diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index 66859cf..85ada4e 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -72,50 +72,50 @@ this repository contains the full copyright notices and license terms. -->
                 xalign="0" yalign="0"
                 col_widths="1fr">
                 <group id="dates" string="Dates"
-                    colspan="1" col="5" panel="card" icon="tryton-date"
+                    colspan="1" col="4" panel="card" icon="tryton-date"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content">
+                    col_widths="min-content,1fr,min-content,1fr">
                     <label name="from_del"/>
                     <field name="from_del"/>
                     <label name="to_del"/>
                     <field name="to_del"/>
+                    <newline/>
                     <label name="finished"/>
                     <field name="finished"/>
                 </group>
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
-                    colspan="1" col="6" panel="card" icon="tryton-public"
+                    colspan="1" col="4" panel="card" icon="tryton-public"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
+                    col_widths="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"/>
+                    <newline/>
                     <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"/>
+                    <newline/>
                     <label name="progress"/>
                     <field name="progress" widget="progressbar" colspan="3"/>
                 </group>
                 <group id="currencies_links" string="Currencies &amp; Links"
-                    colspan="1" col="2" panel="card" icon="tryton-link"
+                    colspan="1" col="4" panel="card" icon="tryton-link"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr">
+                    col_widths="min-content,min-content,min-content,1fr">
                     <label name="enable_linked_currency"/>
-                    <field name="enable_linked_currency"/>
-                    <newline/>
+                    <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <label name="linked_currency"/>
                     <field name="linked_currency"/>
                     <newline/>
                     <label name="linked_unit"/>
                     <field name="linked_unit"/>
-                    <newline/>
                     <label name="linked_price"/>
                     <field name="linked_price"/>
                     <newline/>
                     <label name="certif"/>
-                    <field name="certif"/>
+                    <field name="certif" colspan="3"/>
                 </group>
             </group>
             <group id="description" string="Description"