diff --git a/addons/mass_mailing/models/res_config.py b/addons/mass_mailing/models/res_config.py
index 8ab79b8b2fd..c22bec90e93 100644
--- a/addons/mass_mailing/models/res_config.py
+++ b/addons/mass_mailing/models/res_config.py
@@ -8,9 +8,7 @@ class MassMailingConfiguration(models.TransientModel):
     _name = 'mass.mailing.config.settings'
     _inherit = 'res.config.settings'
 
-    group_mass_mailing_campaign = fields.Selection([
-        (0, "Do not organize and schedule mail campaigns (easy)"),
-        (1, "Allow using marketing campaigns (advanced)")], string="Campaigns",
-        implied_group='mass_mailing.group_mass_mailing_campaign',
-        help="""Manage mass mailign using Campaigns""")
-    module_mass_mailing_themes = fields.Boolean("Mass mailing themes")
+    group_mass_mailing_campaign = fields.Boolean(string="Mass Mailing Campaigns", implied_group='mass_mailing.group_mass_mailing_campaign', help="""This is useful if your marketing campaigns are composed of several emails""")
+    module_mass_mailing_themes = fields.Boolean("Email Templates")
+    module_website_mass_mailing = fields.Boolean("Website Call-to-Action")
+    module_crm = fields.Boolean("Leads/Opportunities")
diff --git a/addons/mass_mailing/views/res_config_views.xml b/addons/mass_mailing/views/res_config_views.xml
index f6ef49c620a..d7164d017d7 100644
--- a/addons/mass_mailing/views/res_config_views.xml
+++ b/addons/mass_mailing/views/res_config_views.xml
@@ -6,18 +6,68 @@
             <field name="arch" type="xml">
                 <form string="Configure Mass Mailing" class="oe_form_configuration">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Save" type="object" name="execute" class="oe_highlight"/>
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group string="Mass Mailing" name="mass_mailing_group">
-                        <field name="group_mass_mailing_campaign" widget="radio"/>
-                        <label for="module_mass_mailing_themes" string="Mass mailing themes"/>
-                        <div>
-                            <field name="module_mass_mailing_themes" widget="upgrade_boolean"/>
-                            <label for="module_mass_mailing_themes" invisible="1"/>
-                            <a href="https://www.odoo.com/page/email-marketing" target="_blank"> More Info </a>
+                    <sheet>
+                      <h2>Design</h2>
+                        <div class="row mt16 o_settings_container">
+                            <div class="col-md-6 o_setting_box col-xs-12">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_mass_mailing_themes" widget="upgrade_boolean"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="module_mass_mailing_themes"/>
+                                    <div class="text-muted">
+                                        Choose among multiple email templates and styles
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-6 o_setting_box col-xs-12" title="This tool is advised if your marketing campaign is composed of several emails.">
+                                <div class="o_setting_left_pane" title="This is useful if your marketing campaigns are composed of several emails.">
+                                    <field name="group_mass_mailing_campaign"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="group_mass_mailing_campaign"/>
+                                    <div class="text-muted">
+                                        Manage campaigns of mass emails with process stages
+                                    </div>
+                                    <div class="content-group" attrs="{'invisible': [('group_mass_mailing_campaign', '=', False)]}">
+                                        <div class="mt16">
+                                            <button name="%(mass_mailing.action_view_mass_mailing_stages)d"
+                                                icon="fa-arrow-right" type="action" string="Campaign Stages"
+                                                class="btn-link"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </group>
+                        <h2>Mailing Lists</h2>
+                        <div class="row mt16 o_settings_container">
+                            <div class="col-md-6 o_setting_box col-xs-12" id="module_website_mass_mailing" title="This adds a new Newsletter snippet to drag &amp; drop on on your website pages. This call-to-action prompts visitors to enter their email address to join a mailing list.">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_website_mass_mailing"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="module_website_mass_mailing"/>
+                                    <div class="text-muted">
+                                        Encourage to subscribe to mailing lists with a call-to-action
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-6 o_setting_box col-xs-12">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_crm"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="module_crm"/>
+                                    <div class="text-muted">
+                                        Manage mailing campaigns with your prospects
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/website_mass_mailing/models/res_config.py b/addons/website_mass_mailing/models/res_config.py
index f30da75f8e0..602d575e151 100644
--- a/addons/website_mass_mailing/models/res_config.py
+++ b/addons/website_mass_mailing/models/res_config.py
@@ -7,8 +7,4 @@ from odoo import fields, models
 class MassMailingConfiguration(models.TransientModel):
     _inherit = 'mass.mailing.config.settings'
 
-    group_website_popup_on_exit = fields.Selection([
-        (0, 'Do not add extra content on website pages to encourage visitors to sign up'),
-        (1, 'Allow the use of a pop-up snippet on website to encourage visitors to sign up on a mass mailing list')
-    ], string="Website Pop-up",
-        implied_group="website_mass_mailing.group_website_popup_on_exit")
+    group_website_popup_on_exit = fields.Boolean(string="Website Popup", implied_group="website_mass_mailing.group_website_popup_on_exit")
diff --git a/addons/website_mass_mailing/views/res_config_view.xml b/addons/website_mass_mailing/views/res_config_view.xml
index 752a8f86d8f..2def07a7aa3 100644
--- a/addons/website_mass_mailing/views/res_config_view.xml
+++ b/addons/website_mass_mailing/views/res_config_view.xml
@@ -5,8 +5,18 @@
         <field name="name">mass.mailing.config.settings.inherit</field>
         <field name="model">mass.mailing.config.settings</field>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='mass_mailing_group']" position="inside">
-                <field name="group_website_popup_on_exit" widget="radio"/>
+            <xpath expr="//div[@id='module_website_mass_mailing']" position="after">
+                <div class="col-md-6 o_setting_box col-xs-12" title="This adds a new Newsletter Popup snippet to drag &amp; drop on on your website pages. It triggers a popup when visitors land on the page. This popup prompts them to enter their email address to join a mailing list.">
+                    <div class="o_setting_left_pane">
+                        <field name="group_website_popup_on_exit"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="group_website_popup_on_exit"/>
+                        <div class="text-muted">
+                            Encourage to subscribe to mailing lists with a popup
+                        </div>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>