diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 19480877dcc..d4390a6c94b 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -26,7 +26,7 @@
                             </div>
                         </div>
                         <h2>Website</h2>
-                        <div class="row mt16 o_settings_container" id="webmaster_settings">
+                        <div class="row mt16 o_settings_container" id="website_settings">
                             <div class="col-12  o_setting_box" id="website_action_setting">
                                 <button name="website_go_to" type="object" string="Go to Website" class="btn btn-primary" icon="fa-globe"/>
                                 <button name="%(website.action_website_add_features)d" type="action" string="Add features" class="ml-2 btn btn-secondary" icon="fa-plus"/>
@@ -173,31 +173,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-12 col-lg-6 o_setting_box" id="google_maps_setting">
-                                <div class="o_setting_left_pane">
-                                    <field name="has_google_maps"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="has_google_maps"/>
-                                    <span class="fa fa-lg fa-globe" title="Values set here are website-specific." groups="website.group_multi_website"/>
-                                    <div class="text-muted">
-                                        Use Google Map on your website (<a href="/contactus">Contact Us</a> page, snippets, ...)
-                                    </div>
-                                    <div class="content-group" attrs="{'invisible': [('has_google_maps', '=', False)]}">
-                                        <div class="row mt16">
-                                            <label class="col-lg-3 o_light_label" string="API Key" for="google_maps_api_key"/>
-                                            <field name="google_maps_api_key" attrs="{'required': [('has_google_maps', '=', True)]}" />
-                                        </div>
-                                    </div>
-                                    <div attrs="{'invisible': [('has_google_maps', '=', False)]}">
-                                        <a role="button" class="btn-link" target="_blank"
-                                           href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,static_maps_backend&amp;keyType=CLIENT_SIDE&amp;reusekey=true">
-                                            <i class="fa fa-arrow-right"/>
-                                            Create a Google Project and Get a Key
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-12 col-lg-6 o_setting_box" groups="website.group_multi_website">
                                 <div class="o_setting_left_pane">
                                     <field name="specific_user_account"/>
@@ -237,28 +212,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-12 col-lg-6 o_setting_box" id="utm_tracker_settings" title="Analyze the efficiency of your marketing campaigns by using trackable UTM trackers (campaigns, medium, sources). Create trackers and follow clicks from the Promote menu of your website. Those trackers can be used in Google Analytics or in Odoo reports where you can see the opportunities and sales revenue generated thanks to your links.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_website_links"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_website_links"/>
-                                    <div class="text-muted">
-                                        Track clicks on UTM links
-                                    </div>
-                                </div>
-                            </div>
-                            <div id="multi_website" class="col-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="group_multi_website"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Multi-Websites" for="group_multi_website"/>
-                                    <div class="text-muted">
-                                        Manage multiple websites
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-12 col-lg-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="has_social_network"/>
@@ -302,6 +255,56 @@
                                 </div>
                             </div>
                         </div>
+                        <h2>Features</h2>
+                        <div class="row mt16 o_settings_container" id="webmaster_settings">
+                            <div id="multi_website" class="col-12 col-md-6 o_setting_box">
+                                <div class="o_setting_left_pane">
+                                    <field name="group_multi_website"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label string="Multi-Websites" for="group_multi_website"/>
+                                    <div class="text-muted">
+                                        Manage multiple websites
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-12 col-lg-6 o_setting_box" id="google_maps_setting">
+                                <div class="o_setting_left_pane">
+                                    <field name="has_google_maps"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="has_google_maps"/>
+                                    <span class="fa fa-lg fa-globe" title="Values set here are website-specific." groups="website.group_multi_website"/>
+                                    <div class="text-muted">
+                                        Use Google Map on your website (<a href="/contactus">Contact Us</a> page, snippets, ...)
+                                    </div>
+                                    <div class="content-group" attrs="{'invisible': [('has_google_maps', '=', False)]}">
+                                        <div class="row mt16">
+                                            <label class="col-lg-3 o_light_label" string="API Key" for="google_maps_api_key"/>
+                                            <field name="google_maps_api_key" attrs="{'required': [('has_google_maps', '=', True)]}" />
+                                        </div>
+                                    </div>
+                                    <div attrs="{'invisible': [('has_google_maps', '=', False)]}">
+                                        <a role="button" class="btn-link" target="_blank"
+                                           href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,static_maps_backend&amp;keyType=CLIENT_SIDE&amp;reusekey=true">
+                                            <i class="fa fa-arrow-right"/>
+                                            Create a Google Project and Get a Key
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-12 col-lg-6 o_setting_box" id="utm_tracker_settings" title="Analyze the efficiency of your marketing campaigns by using trackable UTM trackers (campaigns, medium, sources). Create trackers and follow clicks from the Promote menu of your website. Those trackers can be used in Google Analytics or in Odoo reports where you can see the opportunities and sales revenue generated thanks to your links.">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_website_links"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="module_website_links"/>
+                                    <div class="text-muted">
+                                        Track clicks on UTM links
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/website_livechat/views/res_config_settings_views.xml b/addons/website_livechat/views/res_config_settings_views.xml
index bdd8aa9f701..0b72077c5ff 100644
--- a/addons/website_livechat/views/res_config_settings_views.xml
+++ b/addons/website_livechat/views/res_config_settings_views.xml
@@ -6,7 +6,7 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <div id="languages_setting" position="after">
+            <div id="google_maps_setting" position="after">
                 <div class="col-12 col-lg-6 o_setting_box" id="live_chat_install_setting">
                     <div class="o_setting_right_pane">
                         <span class="o_form_label">Live Chat</span>
diff --git a/addons/website_slides/views/res_config_settings_views.xml b/addons/website_slides/views/res_config_settings_views.xml
index 1d702e1ec28..bbf97e1a465 100644
--- a/addons/website_slides/views/res_config_settings_views.xml
+++ b/addons/website_slides/views/res_config_settings_views.xml
@@ -5,7 +5,7 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <div id="languages_setting" position="after">
+            <div id="google_maps_setting" position="after">
                 <div class="col-12 col-lg-6 o_setting_box" id="slides_install_setting">
                     <div class="o_setting_right_pane">
                         <span class="o_form_label">Slides</span>
diff --git a/addons/website_twitter/views/res_config_settings_views.xml b/addons/website_twitter/views/res_config_settings_views.xml
index 47096a973db..5a90c2294ea 100644
--- a/addons/website_twitter/views/res_config_settings_views.xml
+++ b/addons/website_twitter/views/res_config_settings_views.xml
@@ -5,7 +5,7 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <div id="languages_setting" position="after">
+            <div id="google_maps_setting" position="after">
                 <div class="col-12 col-lg-6 o_setting_box" id="twitter_roller_install_setting">
                     <div class="o_setting_right_pane">
                         <span class="o_form_label">Twitter Roller</span>