diff --git a/modules/analytic_sale/view/sale_line_form.xml b/modules/analytic_sale/view/sale_line_form.xml
index 12cd351..e72bc89 100755
--- a/modules/analytic_sale/view/sale_line_form.xml
+++ b/modules/analytic_sale/view/sale_line_form.xml
@@ -2,8 +2,8 @@
 <!-- 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" position="inside">
-        <page string="Analytic" id="analytic_accounts">
+    <xpath expr="/form/notebook/page[@id='invoice']" position="before">
+        <page string="Analytics" id="analytic_accounts">
             <field name="analytic_accounts" colspan="4"/>
         </page>
     </xpath>
diff --git a/modules/purchase_trade/view/purchase_form.xml b/modules/purchase_trade/view/purchase_form.xml
index 36f73f5..0a74ac8 100755
--- a/modules/purchase_trade/view/purchase_form.xml
+++ b/modules/purchase_trade/view/purchase_form.xml
@@ -55,36 +55,12 @@ this repository contains the full copyright notices and license terms. -->
         <field name="product_origin"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id='purchase']" position="after">
-        <page string="Charter Conditions" id="charter_conditions">
-            <field name="charter_conditions" colspan="4" mode="tree,form" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
-        </page>
         <page string="Contract Clauses" col="4" id="contract_clauses">
             <label name="contract_template"/>
             <field name="contract_template"/>
             <newline/>
             <field name="contract_clauses" colspan="4" mode="tree,form" view_ids="purchase_trade.contract_clause_selection_view_tree,purchase_trade.contract_clause_selection_view_form"/>
         </page>
-        <page string="Derivative" col="4" id="der">
-            <field name="derivatives" mode="tree" view_ids="purchase_trade.derivative_view_tree_sequence" height="450"/>
-        </page>
-        <page string="Pnl" col="4" >
-            <label name="group_pnl"/>
-            <field name="group_pnl" colspan="1"/>
-            <newline/>
-            <field name="pnl_" mode="tree,graph,graph" view_ids="purchase_trade.valuation_view_tree_sequence3,purchase_trade.valuation_view_graph,purchase_trade.valuation_view_graph2" height="450" colspan="4"/>
-            <field name="pnl" mode="tree" view_ids="purchase_trade.valuation_view_tree_sequence4" height="450" colspan="4"/>
-        </page>
-        <page string="Forex" col="4" id="fo">
-            <field name="forex" mode="tree" view_ids="purchase_trade.view_forex_cover_physical_contract_tree2"/>
-        </page>
-        <page string="Execution plan" col="4" id="ep">
-            <label name="plan" />
-            <field name="plan" />
-            <!-- <field name="plans" mode="tree,form" view_ids="purchase_trade.ep_view_list,purchase_trade.ep_view_form"/> -->
-        </page>
-        <page string="Estimated dates" col="4" id="estimated">
-            <field name="estimated_date" />
-        </page>
         <page string="Required documents" id="rd">
             <group col="2" id="dt">
                 <label name="doc_template"/>
@@ -93,9 +69,35 @@ this repository contains the full copyright notices and license terms. -->
             <newline/> 
             <field name="required_documents" colspan="4"/>
         </page>
-        <page string="Dimensions" id="di">
+        <page string="Charter Conditions" id="charter_conditions">
+            <field name="charter_conditions" colspan="4" mode="tree,form" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
+        </page>
+        <page string="Analytics" id="di">
             <field name="analytic_dimensions" colspan="4"/>
         </page>
+        <page string="Estimated dates" col="4" id="estimated">
+            <field name="estimated_date" />
+        </page>
+        <page string="Execution plan" col="4" id="ep">
+            <label name="plan" />
+            <field name="plan" />
+            <!-- <field name="plans" mode="tree,form" view_ids="purchase_trade.ep_view_list,purchase_trade.ep_view_form"/> -->
+        </page>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='info']" position="after">
+        <page string="Derivatives" col="4" id="der">
+            <field name="derivatives" mode="tree" view_ids="purchase_trade.derivative_view_tree_sequence" height="450"/>
+        </page>
+        <page string="Forex" col="4" id="fo">
+            <field name="forex" mode="tree" view_ids="purchase_trade.view_forex_cover_physical_contract_tree2"/>
+        </page>
+        <page string="Pnl" col="4" >
+            <label name="group_pnl"/>
+            <field name="group_pnl" colspan="1"/>
+            <newline/>
+            <field name="pnl_" mode="tree,graph,graph" view_ids="purchase_trade.valuation_view_tree_sequence3,purchase_trade.valuation_view_graph,purchase_trade.valuation_view_graph2" height="450" colspan="4"/>
+            <field name="pnl" mode="tree" view_ids="purchase_trade.valuation_view_tree_sequence4" height="450" colspan="4"/>
+        </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='info']/label[@name='invoice_party']" position="before">
         <field name="bank_accounts" colspan="4" invisible="1"/>
diff --git a/modules/purchase_trade/view/sale_form.xml b/modules/purchase_trade/view/sale_form.xml
index 03cf62a..e38174e 100755
--- a/modules/purchase_trade/view/sale_form.xml
+++ b/modules/purchase_trade/view/sale_form.xml
@@ -55,31 +55,12 @@ this repository contains the full copyright notices and license terms. -->
         <field name="product_origin"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id='sale']" position="after">
-        <page string="Charter Conditions" id="charter_conditions">
-            <field name="charter_conditions" colspan="4" mode="tree,form" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
-        </page>
         <page string="Contract Clauses" col="4" id="contract_clauses">
             <label name="contract_template"/>
             <field name="contract_template"/>
             <newline/>
             <field name="contract_clauses" colspan="4" mode="tree,form" view_ids="purchase_trade.contract_clause_selection_view_tree,purchase_trade.contract_clause_selection_view_form"/>
         </page>
-        <page string="Derivative" col="4" id="der">
-            <field name="derivatives" mode="tree" view_ids="purchase_trade.derivative_view_tree_sequence" height="450"/>
-        </page>
-        <page string="Pnl" col="4" >
-            <label name="group_pnl"/>
-            <field name="group_pnl" colspan="1"/>
-            <newline/>
-            <field name="pnl_" mode="tree,graph,graph" view_ids="purchase_trade.valuation_view_tree_sequence3,purchase_trade.valuation_view_graph,purchase_trade.valuation_view_graph2" height="450" colspan="4"/>
-            <field name="pnl" mode="tree" view_ids="purchase_trade.valuation_view_tree_sequence4" height="450" colspan="4"/>
-        </page>
-        <page string="Forex" col="4" id="fo">
-            <field name="forex" mode="tree" view_ids="purchase_trade.view_forex_cover_physical_sale_tree2"/>
-        </page>
-        <!-- <page string="Execution plan" col="4" id="ep">
-            <field name="plans" mode="tree,form" view_ids="purchase_trade.ep_view_list,purchase_trade.ep_view_form"/>
-        </page> -->
         <page string="Required documents" id="rd">
             <group col="2" id="dt">
                 <label name="doc_template"/>
@@ -88,9 +69,30 @@ this repository contains the full copyright notices and license terms. -->
             <newline/> 
             <field name="required_documents" colspan="4"/>
         </page>
-        <page string="Dimensions" id="di">
+        <page string="Charter Conditions" id="charter_conditions">
+            <field name="charter_conditions" colspan="4" mode="tree,form" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
+        </page>
+        <page string="Analytics" id="di">
             <field name="analytic_dimensions" colspan="4"/>
         </page>
+        <!-- <page string="Execution plan" col="4" id="ep">
+            <field name="plans" mode="tree,form" view_ids="purchase_trade.ep_view_list,purchase_trade.ep_view_form"/>
+        </page> -->
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='other']" position="after">
+        <page string="Derivatives" col="4" id="der">
+            <field name="derivatives" mode="tree" view_ids="purchase_trade.derivative_view_tree_sequence" height="450"/>
+        </page>
+        <page string="Forex" col="4" id="fo">
+            <field name="forex" mode="tree" view_ids="purchase_trade.view_forex_cover_physical_sale_tree2"/>
+        </page>
+        <page string="Pnl" col="4" >
+            <label name="group_pnl"/>
+            <field name="group_pnl" colspan="1"/>
+            <newline/>
+            <field name="pnl_" mode="tree,graph,graph" view_ids="purchase_trade.valuation_view_tree_sequence3,purchase_trade.valuation_view_graph,purchase_trade.valuation_view_graph2" height="450" colspan="4"/>
+            <field name="pnl" mode="tree" view_ids="purchase_trade.valuation_view_tree_sequence4" height="450" colspan="4"/>
+        </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='sale']/notebook/page[@id='line']/field[@name='payment_term']" position="after">
         <label name="from_location"/>
diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index cdad76d..29d68c7 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -65,49 +65,67 @@ this repository contains the full copyright notices and license terms. -->
         <field name="tolerance_max" invisible="1" colspan="4"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id='general']" position="after">
-        <page string="Premium composition" col="4" id="premium_composition">
-            <field name="premium_decomposition" colspan="4" mode="tree,form" view_ids="purchase_trade.premium_composition_view_tree,purchase_trade.premium_composition_view_form"/>
-        </page>
-        <page string="Charter Conditions" id="charter_conditions">
-            <field name="charter_conditions" colspan="4" mode="tree,form" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
-        </page>
-    </xpath>
-    <xpath expr="/form/notebook/page[@id='taxes']" position="before">
-        <page string="Price composition" col="4" id="pc">
-            <field name="price_composition" view_ids="purchase_trade.price_composition_view_tree"/>
-        </page>
-        <page string="Lots" col="4" id="lots">
-            <field name="lots" view_ids="lot.lot_view_tree_sequence"/>
-        </page>
         <page string="Fees" col="4" id="fees">
             <button name="apply_default_fees" icon="tryton-launch"/>
             <field name="fees" colspan="4" view_ids="purchase_trade.fee_view_tree_sequence"/>
         </page>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='commissions']" position="after">
+        <page string="Charter Conditions" id="charter_conditions">
+            <field name="charter_conditions" colspan="4" mode="tree,form" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
+        </page>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='att']" position="replace"/>
+    <xpath expr="/form/notebook/page[@id='notes']" position="replace"/>
+    <xpath expr="/form/notebook/page[@id='taxes']" position="before">
+        <page string="Estimated dates" col="4" id="estimated">
+            <field name="estimated_date" />
+        </page>
+        <page string="Pricing" col="4" id="pricing">
+            <notebook colspan="4">
+                <page string="Components" col="4" id="components">
+                    <field name="price_components" mode="tree,form" view_ids="purchase_trade.component_view_tree_sequence2,purchase_trade.component_view_form2"/> 
+                </page>
+                <page string="Pricing dates" col="4" id="pricing_date">
+                    <field name="price_pricing" />
+                </page>
+                <page string="Summary" col="4" id="summary">
+                    <field name="price_summary" />
+                </page>
+                <page string="Report" col="4" id="report">
+                    <label name="pricing_rule" />
+                    <field name="pricing_rule" />
+                </page>
+            </notebook>
+        </page>
+        <page string="Price composition" col="4" id="pc">
+            <field name="price_composition" view_ids="purchase_trade.price_composition_view_tree"/>
+        </page>
+        <page string="Premium composition" col="4" id="premium_composition">
+            <field name="premium_decomposition" colspan="4" mode="tree,form" view_ids="purchase_trade.premium_composition_view_tree,purchase_trade.premium_composition_view_form"/>
+        </page>
         <page string="Mtm" col="4" id="mtm">
             <field name="mtm" colspan="4"/>
         </page>
-        <page string="Derivatives" col="4" id="der">
-            <field name="derivatives" colspan="4"/>
-        </page>
-        <page string="Pricing" col="4" id="pricing">
-            <notebook colspan="4">
-                <page string="Components" col="4" id="components">
-                    <field name="price_components" mode="tree,form" view_ids="purchase_trade.component_view_tree_sequence2,purchase_trade.component_view_form2"/> 
-                </page>
-                <page string="Pricing dates" col="4" id="pricing_date">
-                    <field name="price_pricing" />
-                </page>
-                <page string="Summary" col="4" id="summary">
-                    <field name="price_summary" />
-                </page>
-                <page string="Report" col="4" id="report">
-                    <label name="pricing_rule" />
-                    <field name="pricing_rule" />
-                </page>
-            </notebook>
-        </page>
-        <page string="Estimated dates" col="4" id="estimated">
-            <field name="estimated_date" />
-        </page>
-    </xpath>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='taxes']" position="replace"/>
+    <xpath expr="/form/notebook/page[@id='invoice']" position="after">
+        <page string="Taxes" id="taxes">
+            <field name="taxes" colspan="4"/>
+        </page>
+        <page string="Lots" col="4" id="lots">
+            <field name="lots" view_ids="lot.lot_view_tree_sequence"/>
+        </page>
+        <page string="Attributes" id="att">
+            <label name="attributes"/>
+            <field name="attributes"/>
+        </page>
+        <page string="Derivatives" col="4" id="der">
+            <field name="derivatives" colspan="4"/>
+        </page>
+        <page string="Notes" id="notes">
+            <separator name="note" colspan="4"/>
+            <field name="note" colspan="4"/>
+        </page>
+    </xpath>
 </data>