diff --git a/addons/website_crm_partner_assign/__manifest__.py b/addons/website_crm_partner_assign/__manifest__.py
index aec9cf1600c..0bd6dbba40c 100644
--- a/addons/website_crm_partner_assign/__manifest__.py
+++ b/addons/website_crm_partner_assign/__manifest__.py
@@ -27,6 +27,8 @@ The automatic assignment is figured from the weight of partner levels and the ge
         'data/crm_lead_merge_template.xml',
         'data/crm_tag_data.xml',
         'data/mail_template_data.xml',
+        'data/res_partner_activation_data.xml',
+        'data/res_partner_grade_data.xml',
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
         'wizard/crm_forward_to_partner_view.xml',
diff --git a/addons/website_crm_partner_assign/data/res_partner_activation_data.xml b/addons/website_crm_partner_assign/data/res_partner_activation_data.xml
new file mode 100644
index 00000000000..c75cfe10494
--- /dev/null
+++ b/addons/website_crm_partner_assign/data/res_partner_activation_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="res_partner_activation_data_fully_operational" model="res.partner.activation">
+        <field name="name">Fully Operational</field>
+        <field name="sequence">3</field>
+    </record>
+    <record id="res_partner_activation_data_ramp_up" model="res.partner.activation">
+        <field name="name">Ramp-up</field>
+        <field name="sequence">2</field>
+    </record>
+    <record id="res_partner_activation_data_first_contact" model="res.partner.activation">
+        <field name="name">First Contact</field>
+        <field name="sequence">1</field>
+    </record>
+</odoo>
diff --git a/addons/website_crm_partner_assign/data/res_partner_demo.xml b/addons/website_crm_partner_assign/data/res_partner_demo.xml
index dde9e124af6..1cf8ecd345e 100644
--- a/addons/website_crm_partner_assign/data/res_partner_demo.xml
+++ b/addons/website_crm_partner_assign/data/res_partner_demo.xml
@@ -1,70 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-        <record id="res_partner_grade_platinium" model="res.partner.grade">
-            <field name="name">Platinum</field>
-            <field name="sequence">4</field>
-        </record>
-        <record id="res_partner_grade_gold" model="res.partner.grade">
-            <field name="name">Gold</field>
-            <field name="sequence">3</field>
-        </record>
-        <record id="res_partner_grade_silver" model="res.partner.grade">
-            <field name="name">Silver</field>
-            <field name="sequence">2</field>
-        </record>
-        <record id="res_partner_grade_bronze" model="res.partner.grade">
-            <field name="name">Bronze</field>
-            <field name="sequence">1</field>
-        </record>
-
         <record id="base.res_partner_3" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_bronze"/>
+            <field name="grade_id" ref="res_partner_grade_data_bronze"/>
             <field name="partner_weight">10</field>
         </record>
         <record model="res.partner" id="base.res_partner_2">
             <field name="assigned_partner_id" ref="base.res_partner_3"/>
         </record>
        <record id="base.res_partner_4" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_bronze"/>
+            <field name="grade_id" ref="res_partner_grade_data_bronze"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_bronze"/>
+            <field name="grade_id" ref="res_partner_grade_data_bronze"/>
             <field name="partner_weight">10</field>
         </record>
 
         <record id="base.res_partner_3" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_silver"/>
+            <field name="grade_id" ref="res_partner_grade_data_silver"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_silver"/>
+            <field name="grade_id" ref="res_partner_grade_data_silver"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_silver"/>
+            <field name="grade_id" ref="res_partner_grade_data_silver"/>
             <field name="partner_weight">10</field>
         </record>
 
         <record id="base.res_partner_10" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_gold"/>
+            <field name="grade_id" ref="res_partner_grade_data_gold"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_18" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_gold"/>
+            <field name="grade_id" ref="res_partner_grade_data_gold"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_1" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_gold"/>
-            <field name="partner_weight">10</field>
-        </record>
-
-        <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_platinium"/>
-            <field name="partner_weight">10</field>
-        </record>
-        <record id="base.res_partner_4" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_platinium"/>
+            <field name="grade_id" ref="res_partner_grade_data_gold"/>
             <field name="partner_weight">10</field>
         </record>
 
diff --git a/addons/website_crm_partner_assign/data/res_partner_grade_data.xml b/addons/website_crm_partner_assign/data/res_partner_grade_data.xml
new file mode 100644
index 00000000000..86b774a91e0
--- /dev/null
+++ b/addons/website_crm_partner_assign/data/res_partner_grade_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="res_partner_grade_data_gold" model="res.partner.grade">
+        <field name="name">Gold</field>
+        <field name="sequence">3</field>
+    </record>
+    <record id="res_partner_grade_data_silver" model="res.partner.grade">
+        <field name="name">Silver</field>
+        <field name="sequence">2</field>
+    </record>
+    <record id="res_partner_grade_data_bronze" model="res.partner.grade">
+        <field name="name">Bronze</field>
+        <field name="sequence">1</field>
+    </record>
+</odoo>
diff --git a/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml b/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
index c12607f0cbf..c04c1b22036 100644
--- a/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
+++ b/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="website_crm_partner_assign.res_partner_grade_platinium" model="res.partner.grade">
+        <record id="website_crm_partner_assign.res_partner_grade_data_gold" model="res.partner.grade">
             <field name="is_published" eval="True" />
         </record>
-        <record id="website_crm_partner_assign.res_partner_grade_gold" model="res.partner.grade">
+        <record id="website_crm_partner_assign.res_partner_grade_data_silver" model="res.partner.grade">
             <field name="is_published" eval="True" />
         </record>
-        <record id="website_crm_partner_assign.res_partner_grade_silver" model="res.partner.grade">
+        <record id="website_crm_partner_assign.res_partner_grade_data_bronze" model="res.partner.grade">
             <field name="is_published" eval="True" />
         </record>
-        <record id="website_crm_partner_assign.res_partner_grade_bronze" model="res.partner.grade">
-            <field name="is_published" eval="True" />
-        </record>
-        <record id="base.partner_demo_portal" model="res.partner">
-            <field name="grade_id" ref="website_crm_partner_assign.res_partner_grade_platinium"/>
-            <field name="partner_weight">10</field>
-        </record>
     </data>
 </odoo>
diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py
index 8790859f0c5..8e7bc8a0fa6 100644
--- a/addons/website_crm_partner_assign/models/res_partner.py
+++ b/addons/website_crm_partner_assign/models/res_partner.py
@@ -7,7 +7,7 @@ from odoo.addons.http_routing.models.ir_http import slug
 
 class ResPartnerGrade(models.Model):
     _name = 'res.partner.grade'
-    _order = 'sequence'
+    _order = 'sequence desc'
     _inherit = ['website.published.mixin']
     _description = 'Partner Grade'
 
@@ -28,7 +28,7 @@ class ResPartnerGrade(models.Model):
 
 class ResPartnerActivation(models.Model):
     _name = 'res.partner.activation'
-    _order = 'sequence'
+    _order = 'sequence desc'
     _description = 'Partner Activation'
 
     sequence = fields.Integer('Sequence')
diff --git a/addons/website_crm_partner_assign/views/res_partner_views.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml
index 61555b7c5c7..a5995d04b61 100644
--- a/addons/website_crm_partner_assign/views/res_partner_views.xml
+++ b/addons/website_crm_partner_assign/views/res_partner_views.xml
@@ -34,6 +34,13 @@
             <field name="name">Partner Activations</field>
             <field name="res_model">res.partner.activation</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+               <p class="o_view_nocontent_smiling_face">
+                  Create a Partner Activation
+               </p><p>
+                  Those are used to know where your Partners stand in your onboarding process.
+               </p>
+            </field>
         </record>
 
         <menuitem id="res_partner_activation_config_mi" parent="crm_menu_resellers" action="res_partner_activation_act"
@@ -90,9 +97,16 @@
     </record>
 
     <record id="res_partner_grade_action" model="ir.actions.act_window">
-        <field name="name">Partner Level</field>
+        <field name="name">Partner Levels</field>
         <field name="res_model">res.partner.grade</field>
         <field name="search_view_id" ref="res_partner_grade_view_search"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a Partner Level
+            </p><p>
+                Partner Levels allow you to rank your Partners based on their performances.
+            </p>
+        </field>
     </record>
 
     <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"