diff --git a/modules/purchase_trade/view/purchase_form.xml b/modules/purchase_trade/view/purchase_form.xml
index acf3bd8..f9d9ee7 100755
--- a/modules/purchase_trade/view/purchase_form.xml
+++ b/modules/purchase_trade/view/purchase_form.xml
@@ -8,9 +8,19 @@ this repository contains the full copyright notices and license terms. -->
         <field name="allow_modification_after_validation" invisible="1"/>
     </xpath>
     <xpath expr="/form/group[@id='hd'][1]" position="replace">
-        <group id="purchase_header_summary" colspan="5" col="10"
+        <group id="purchase_header_visuals" colspan="6" col="4"
+            string="Purchase summary" icon="tryton-dashboard"
+            panel="card" xalign="0" yalign="0"
+            col_widths="1fr,1fr,1fr,1fr">
+            <field name="purchase_summary_data"
+                widget="purchase_summary"
+                colspan="4"
+                height="168"/>
+        </group>
+
+        <group id="purchase_header_summary" colspan="5" col="8"
             panel="summary" xalign="0" yalign="0"
-            col_widths="min-content,2fr,min-content,130px,min-content,1.2fr,min-content,130px,min-content,1fr">
+            col_widths="min-content,2fr,min-content,130px,min-content,1.2fr,min-content,130px">
             <label name="party"/>
             <field name="party"/>
             <label name="number"/>
@@ -19,8 +29,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="reference"/>
             <label name="purchase_date"/>
             <field name="purchase_date"/>
-            <label name="currency"/>
-            <field name="currency"/>
+            <label name="trader"/>
+            <field name="trader"/>
+            <label name="operator"/>
+            <field name="operator"/>
+            <label name="our_reference"/>
+            <field name="our_reference"/>
+            <label name="broker"/>
+            <field name="broker"/>
         </group>
         <group id="purchase_header_buttons" col="-1" colspan="1"
             panel="summary" xalign="1" yalign="0">
@@ -35,58 +51,48 @@ this repository contains the full copyright notices and license terms. -->
             <button name="manual_invoice" icon="tryton-forward"/>
         </group>
 
-        <group id="purchase_header_visuals" colspan="6" col="4"
-            string="Purchase summary" icon="tryton-dashboard"
-            panel="card" xalign="0" yalign="0"
-            col_widths="1fr,1fr,1fr,1fr">
-            <field name="purchase_summary_data"
-                widget="purchase_summary"
-                colspan="4"
-                height="168"/>
-        </group>
-
         <field name="tolerance_min" invisible="1"/>
         <field name="tolerance_max" invisible="1"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id='purchase']" position="replace">
         <page string="Header" id="purchase">
-            <group id="purchase_header_terms_people" colspan="6" col="2"
-                xalign="0" yalign="0" col_widths="1fr,1fr">
-            <group id="purchase_commercial_terms" string="Commercial Terms"
-                colspan="1" col="1" panel="card" icon="tryton-public"
+            <group id="purchase_main_terms" string="Main terms"
+                colspan="6" col="1" panel="card" icon="tryton-public"
                 xalign="0" yalign="0"
                 col_widths="1fr">
-                <group id="purchase_commercial_terms_top"
-                    colspan="1" col="4" xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
-                    <label name="payment_term"/>
-                    <field name="payment_term"/>
-                    <label name="wb"/>
-                    <field name="wb"/>
-                </group>
-                <group id="purchase_commercial_terms_incoterm"
-                    colspan="1" col="4" xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr">
+                <group id="purchase_main_terms_route"
+                    colspan="1" col="8" xalign="0" yalign="0"
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
                     <label name="incoterm"/>
                     <field name="incoterm"/>
                     <label name="incoterm_location"/>
                     <field name="incoterm_location"/>
+                    <label name="from_location"/>
+                    <field name="from_location"/>
+                    <label name="to_location"/>
+                    <field name="to_location"/>
                 </group>
-                <group id="purchase_commercial_terms_tolerance"
+                <group id="purchase_main_terms_payment"
                     colspan="1" col="8" xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,90px,min-content,90px">
-                    <label name="product_origin"/>
-                    <field name="product_origin"/>
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
+                    <label name="payment_term"/>
+                    <field name="payment_term"/>
+                    <label name="currency"/>
+                    <field name="currency"/>
+                    <label name="lc_date"/>
+                    <field name="lc_date"/>
+                    <label name="association"/>
+                    <field name="association"/>
+                </group>
+                <group id="purchase_main_terms_tolerance"
+                    colspan="1" col="8" xalign="0" yalign="0"
+                    col_widths="min-content,1.4fr,min-content,90px,min-content,90px,min-content,2fr">
                     <label name="tolerance_option"/>
                     <field name="tolerance_option"/>
                     <label name="tol_min"/>
                     <field name="tol_min"/>
                     <label name="tol_max"/>
                     <field name="tol_max"/>
-                </group>
-                <group id="purchase_commercial_terms_tolerance_gauge"
-                    colspan="1" col="2" xalign="0" yalign="0"
-                    col_widths="min-content,1fr">
                     <label name="tolerance_used"/>
                     <field name="tolerance_used" widget="tolerance_gauge"
                         min_field="tolerance_min" max_field="tolerance_max"
@@ -94,33 +100,6 @@ this repository contains the full copyright notices and license terms. -->
                 </group>
             </group>
 
-            <group id="purchase_execution" string="People &amp; Execution"
-                colspan="1" col="4" panel="card" icon="tryton-link"
-                xalign="0" yalign="0"
-                col_widths="min-content,1fr,min-content,1fr">
-                <label name="broker"/>
-                <field name="broker"/>
-                <label name="operator"/>
-                <field name="operator"/>
-                <label name="trader"/>
-                <field name="trader"/>
-                <label name="our_reference"/>
-                <field name="our_reference"/>
-                <label name="from_location"/>
-                <field name="from_location"/>
-                <label name="to_location"/>
-                <field name="to_location"/>
-                <label name="association"/>
-                <field name="association"/>
-                <label name="crop"/>
-                <field name="crop"/>
-                <label name="lc_date"/>
-                <field name="lc_date"/>
-                <label name="certif"/>
-                <field name="certif"/>
-            </group>
-
-            </group>
             <field name="lines" colspan="4" mode="form,tree"
                 view_ids="purchase.purchase_line_view_form,purchase.purchase_line_view_tree_sequence"/>
             <notebook colspan="6">