diff --git a/commission_simple_agent_purchase/__manifest__.py b/commission_simple_agent_purchase/__manifest__.py
index d0ce4f4..a8f3221 100644
--- a/commission_simple_agent_purchase/__manifest__.py
+++ b/commission_simple_agent_purchase/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'Commission Simple Agent Purchase',
-    'version': '16.0.1.0.0',
+    'version': '18.0.1.0.0',
     'category': 'Sales',
     'license': 'AGPL-3',
     'summary': 'Glue module between commission_simple_agent and purchase',
diff --git a/commission_simple_agent_purchase/views/commission_result.xml b/commission_simple_agent_purchase/views/commission_result.xml
index 320a428..2c9813a 100644
--- a/commission_simple_agent_purchase/views/commission_result.xml
+++ b/commission_simple_agent_purchase/views/commission_result.xml
@@ -12,7 +12,7 @@
     <field name="inherit_id" ref="commission_simple.commission_result_form"/>
     <field name="arch" type="xml">
         <group name="main-right" position="inside">
-                <field name="purchase_id" attrs="{'invisible': [('assign_type', '!=', 'agent')]}"/>
+                <field name="purchase_id" invisible="assign_type != 'agent'"/>
         </group>
     </field>
 </record>
diff --git a/commission_simple_agent_purchase/wizards/res_config_settings.xml b/commission_simple_agent_purchase/wizards/res_config_settings.xml
index 41fbaee..c04d3f3 100644
--- a/commission_simple_agent_purchase/wizards/res_config_settings.xml
+++ b/commission_simple_agent_purchase/wizards/res_config_settings.xml
@@ -13,23 +13,14 @@
     <field name="model">res.config.settings</field>
     <field name="inherit_id" ref="account.res_config_settings_view_form" />
     <field name="arch" type="xml">
-        <xpath expr="//div[@id='analytic']" position="after">
-            <h2>Commissions</h2>
-            <div class="row mt16 o_settings_container" id="commission_simple">
-                <div class="col-12 col-lg-12 o_setting_box" id="commission_simple-settings">
-                    <div class="o_setting_left_pane" />
-                    <div class="o_setting_right_pane">
-                        <div class="row" id="commission_product_id">
-                            <label for="commission_product_id" class="col-md-5" />
-                            <field name="commission_product_id" context="{'default_type': 'service', 'default_purchase_ok': True, 'default_sale_ok': False, 'default_available_in_pos': False, 'default_purchase_method': 'purchase'}"/>
-                        </div>
-                        <div class="row" id="commission_po_config">
-                            <label for="commission_po_config" class="col-md-5" string="Purchase Order"/>
-                            <field name="commission_po_config" />
-                        </div>
-                    </div>
-                </div>
-            </div>
+        <xpath expr="//block[@id='analytic']" position="after">
+            <block title="Commissions" id="commission_simple">
+                <setting id="commission_product" title="Commission Product">
+                    <field name="commission_product_id" context="{'default_type': 'service', 'default_purchase_ok': True, 'default_sale_ok': False, 'default_available_in_pos': False, 'default_purchase_method': 'purchase'}"/>
+                </setting>
+                <setting id="commission_po_config" title="Purchase Order">
+                    <field name="commission_po_config" />
+                </setting>
         </xpath>
     </field>
 </record>