diff --git a/modules/purchase_trade/view/purchase_form.xml b/modules/purchase_trade/view/purchase_form.xml
index 0a74ac8..326858f 100755
--- a/modules/purchase_trade/view/purchase_form.xml
+++ b/modules/purchase_trade/view/purchase_form.xml
@@ -2,57 +2,110 @@
 <!-- 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/group/field[@name='currency']" position="after">
-        <newline/>
-        <label name="lc_date"/>
-        <field name="lc_date"/>
-        <label name="wb"/>
-        <field name="wb"/>
-        <newline/>
-        <label name="certif"/>
-        <field name="certif"/>
-        <newline/>
-        <label name="broker"/>
-        <field name="broker"/>
-        <label name="operator"/>
-        <field name="operator"/>
-        <newline/>
-        <label name="trader"/>
-        <field name="trader"/>
-        <label name="our_reference"/>
-        <field name="our_reference"/>
-        <newline/>
-        <label name="association"/>
-        <field name="association"/>
-        <label name="crop"/>
-        <field name="crop"/>
-        <newline/>
-        <label name="tol_min"/>
-        <field name="tol_min"/>
-        <label name="tol_max"/>
-        <field name="tol_max"/>
-        <newline/>
-        <label name="tolerance_used"/>
-        <field name="tolerance_used" widget="tolerance_gauge"
-            min_field="tolerance_min" max_field="tolerance_max"
-            xexpand="1" xfill="1"/>
-        <label name="tolerance_option"/>
-        <field name="tolerance_option"/>
-        <field name="tolerance_min" invisible="1"/>
-        <field name="tolerance_max" invisible="1"/>
-        <newline/>
-        <label name="from_location"/>
-        <field name="from_location"/>
-        <label name="to_location"/>
-        <field name="to_location"/>
-        <newline/>
-        <label name="incoterm"/>
-        <field name="incoterm"/>
-        <label name="incoterm_location"/>
-        <field name="incoterm_location"/>
-        <newline/>
-        <label name="product_origin"/>
-        <field name="product_origin"/>
+    <xpath expr="/form/group[@id='hd'][2]" position="replace"/>
+    <xpath expr="/form/group[@id='hd'][1]" position="replace">
+        <group id="purchase_header_summary" colspan="6" col="10"
+            panel="summary" xalign="0" yalign="0"
+            col_widths="min-content,2fr,min-content,130px,min-content,1.2fr,min-content,130px,min-content,1fr">
+            <label name="party"/>
+            <field name="party"/>
+            <label name="number"/>
+            <field name="number"/>
+            <label name="reference"/>
+            <field name="reference"/>
+            <label name="purchase_date"/>
+            <field name="purchase_date"/>
+            <label name="currency"/>
+            <field name="currency"/>
+        </group>
+
+        <group id="purchase_header_left" colspan="4" col="1"
+            xalign="0" yalign="0" col_widths="1fr">
+            <group id="purchase_commercial_terms" string="Commercial Terms"
+                colspan="1" col="4" panel="card" icon="tryton-public"
+                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"/>
+                <label name="lc_date"/>
+                <field name="lc_date"/>
+                <label name="certif"/>
+                <field name="certif"/>
+                <label name="incoterm"/>
+                <field name="incoterm"/>
+                <label name="incoterm_location"/>
+                <field name="incoterm_location"/>
+                <label name="product_origin"/>
+                <field name="product_origin"/>
+                <label name="tolerance_option"/>
+                <field name="tolerance_option"/>
+            </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"/>
+            </group>
+
+            <group id="purchase_tolerance" string="Tolerance"
+                colspan="1" col="4" panel="card" icon="tryton-switch"
+                xalign="0" yalign="0"
+                col_widths="min-content,1fr,min-content,1fr">
+                <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"
+                    colspan="3"/>
+                <field name="tolerance_min" invisible="1"/>
+                <field name="tolerance_max" invisible="1"/>
+            </group>
+        </group>
+
+        <group id="purchase_header_right" colspan="2" col="1"
+            xalign="0" yalign="0" col_widths="1fr">
+            <group id="purchase_map" string="Map" colspan="1" col="1"
+                panel="card" icon="tryton-public" xalign="0" yalign="0"
+                col_widths="1fr">
+                <field name="viewer" widget="html_viewer" height="260"/>
+            </group>
+            <group id="purchase_recap" string="Summary" colspan="1" col="2"
+                panel="card" icon="tryton-note" xalign="0" yalign="0"
+                col_widths="min-content,1fr">
+                <label name="state"/>
+                <field name="state"/>
+                <label name="invoice_state"/>
+                <field name="invoice_state"/>
+                <label name="shipment_state"/>
+                <field name="shipment_state"/>
+                <label name="untaxed_amount"/>
+                <field name="untaxed_amount"/>
+                <label name="tax_amount"/>
+                <field name="tax_amount"/>
+                <label name="total_amount"/>
+                <field name="total_amount"/>
+            </group>
+        </group>
     </xpath>
     <xpath expr="/form/notebook/page[@id='purchase']" position="after">
         <page string="Contract Clauses" col="4" id="contract_clauses">