diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml
index 655c18c1f..734e2c5e2 100644
--- a/agreement_account/views/agreement.xml
+++ b/agreement_account/views/agreement.xml
@@ -20,19 +20,43 @@
                 </button>
             </div>
             <group name="main">
-                <field name="partner_id"/>
-                <field name="name"/>
-                <field name="code"/>
-                <field name="agreement_type"/>
-                <field name="signature_date"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-            </group>
-            <group string="Customer Invoices" name="out_invoices" attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
-                <field name="out_invoice_ids" nolabel="1"/>
-            </group>
-            <group string="Supplier Invoices" name="in_invoices" attrs="{'invisible': [('agreement_type', '!=', 'purchase')]}">
-                <field name="in_invoice_ids" nolabel="1"/>
+                <group name="left">
+                    <field name="partner_id"/>
+                    <field name="name"/>
+                    <field name="signature_date"/>
+                </group>
+                <group name="right">
+                    <field name="agreement_type" widget="radio"/>
+                    <field name="code"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                </group>
             </group>
+            <notebook>
+                <page string="Sales" class="oe_page_title"
+                      attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
+                    <group name="sale">
+                        <group name="sale_left">
+                        </group>
+                        <group name="sale_right">
+                        </group>
+                    </group>
+                    <group string="Customer Invoices" name="out_invoices">
+                        <field name="out_invoice_ids" colspan="4" nolabel="1"/>
+                    </group>
+                </page>
+                <page string="Purchases" class="oe_page_title"
+                      attrs="{'invisible': [('agreement_type', '!=', 'purchase')]}">
+                    <group name="purchase">
+                        <group name="purchase_left">
+                        </group>
+                        <group name="purchase_right">
+                        </group>
+                    </group>
+                    <group string="Supplier Invoices" name="in_invoices">
+                        <field name="in_invoice_ids" colspan="4" nolabel="1"/>
+                    </group>
+                </page>
+            </notebook>
         </form>
     </field>
 </record>
diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml
index 68629b553..019aadabf 100644
--- a/agreement_sale/views/agreement.xml
+++ b/agreement_sale/views/agreement.xml
@@ -12,9 +12,9 @@
     <field name="model">agreement</field>
     <field name="inherit_id" ref="agreement_account.agreement_form"/>
     <field name="arch" type="xml">
-        <group name="in_invoices" position="after">
-            <group name="sale_orders" string="Sales Orders" attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
-                <field name="sale_ids" nolabel="1"/>
+        <group name="out_invoices" position="after">
+            <group name="sale_orders" string="Sales Orders">
+                <field name="sale_ids" colspan="4" nolabel="1"/>
             </group>
         </group>
     </field>