diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 70dd3c49bfa..02361a3f643 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -62,7 +62,7 @@ website.ready().done(function () {
             },
             {
                 waitNot:   '.popover.tour',
-                snippet:   '#snippet_structure .oe_snippet:eq(6)',
+                snippet:   '#snippet_structure .oe_snippet:eq(7)',
                 placement: 'bottom',
                 title:     _t("Drag & Drop This Block"),
                 content:   _t("Drag the <em>'Features'</em> block and drop it below the banner."),
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index bcbf8bc0a04..fd2e2f55514 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -51,7 +51,7 @@ website.ready().done(function () {
                 element:   '#oe_manipulators .oe_overlay.oe_active a.btn.btn-primary.btn-sm',
                 placement: 'left',
                 title:     _t("Customize Cover"),
-                content:   _t("Change and customize your blog post cover"),
+                content:   _t("Change and customize your blog post cover."),
                 popover:   { fixed: true },
             },
             {
diff --git a/addons/website_forum/static/src/js/website_forum.editor.js b/addons/website_forum/static/src/js/website_forum.editor.js
index e1a9549dbac..ff7f3ba0957 100644
--- a/addons/website_forum/static/src/js/website_forum.editor.js
+++ b/addons/website_forum/static/src/js/website_forum.editor.js
@@ -27,7 +27,6 @@ contentMenu.EditorBarContent.include({
             }
         }).then(function (forum_name, field, $dialog) {
             var add_menu = ($dialog.find('input[type="checkbox"]').is(':checked'));
-        }).then(function (forum_name) {
             website.form('/forum/new', 'POST', {
                 forum_name: forum_name,
                 add_menu: add_menu || ""
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop.js b/addons/website_sale/static/src/js/website_sale_tour_shop.js
index 3655af43f60..5ee3b37b48e 100644
--- a/addons/website_sale/static/src/js/website_sale_tour_shop.js
+++ b/addons/website_sale/static/src/js/website_sale_tour_shop.js
@@ -80,11 +80,11 @@ website.ready().done(function () {
                 placement: 'right',
                 waitFor:   '.existing-attachment-cell.media_selected',
                 title:       _t("Save"),
-                content:     _t("Click on <em>Save</em> to add the image to the product description"),
+                content:     _t("Click on <em>Save</em> to add the image to the product description."),
             },
             {
                 waitNot:   '.modal-content:visible',
-                snippet:   '#snippet_structure .oe_snippet:eq(9)',
+                snippet:   '#snippet_structure .oe_snippet:eq(8)',
                 placement: 'bottom',
                 title:     _t("Drag & Drop a block"),
                 content:   _t("Drag the 'Big Picture' block and drop it in your page."),
diff --git a/addons/website_version/static/src/js/website_version.tour.versioning.js b/addons/website_version/static/src/js/website_version.tour.versioning.js
index a02da2ebcab..3f1b5349a65 100644
--- a/addons/website_version/static/src/js/website_version.tour.versioning.js
+++ b/addons/website_version/static/src/js/website_version.tour.versioning.js
@@ -28,6 +28,7 @@ Tour.register({
         {
             title:     _t("Click on New version"),
             popover:   { fixed: true },
+            placement: 'left',
             element:   'a[data-action="duplicate_version"]:first',
         },
         {
@@ -40,11 +41,13 @@ Tour.register({
         },
         {
             title:     _t("Validate the version name"),
+            placement: 'right',
             popover:   { fixed: true },
             element:   '.modal button.btn-primary',
         },
         {
             title:     _t("Confirm"),
+            placement: 'right',
             popover:   { fixed: true },
             waitNot:   '.modal input',
             element:   '.modal button.o_confirm',
@@ -74,7 +77,6 @@ Tour.register({
             title:     _t("Customize banner's text"),
             content:   _t("Click in the text and start editing it."),
             sampleText: 'Here, a customized text',
-            popover:   { next: _t("Continue") },
         },
         {
             waitNot:   '#wrap .carousel:first div.carousel-content:has(h2:'+
@@ -94,7 +96,7 @@ Tour.register({
             popover:   { next: _t("Continue") },
         },
         {
-            snippet:   '#snippet_structure .oe_snippet:eq(6)',
+            snippet:   '#snippet_structure .oe_snippet:eq(7)',
             placement: 'bottom',
             title:     _t("Drag & Drop This Block"),
             content:   _t("Drag the <em>'Features'</em> block and drop it below the banner."),
@@ -131,6 +133,7 @@ Tour.register({
 
         {
             title:     _t("Click on Publish Version"),
+            placement: 'left',
             element:   'a[data-action="publish_version"]:first',
             popover:   { fixed: true },
         },
@@ -138,11 +141,12 @@ Tour.register({
         {
             title:     _t("Click on Publish button"),
             element:   '.modal button.o_confirm',
-            placement: 'left',
+            placement: 'right',
         },
 
         {
             title:     _t("Confirm"),
+            placement: 'right',
             element:   '.modal button.o_confirm[data-dismiss]',
             popover:   { fixed: true },
         },
@@ -170,12 +174,14 @@ Tour.register({
 
         {
             title:     _t("Click on delete version button"),
+            placement: 'right',
             element:   '.modal:has(.cancel) button.o_confirm',
             popover:   { fixed: true },
         },
 
         {
             title:     _t("Confirm"),
+            placement: 'right',
             element:   '.modal:not(:has(.cancel)) button.o_confirm[data-dismiss]',
             popover:   { fixed: true },
         },
diff --git a/addons/website_version/views/website_version_templates.xml b/addons/website_version/views/website_version_templates.xml
index 9212634ccf0..973989091ff 100644
--- a/addons/website_version/views/website_version_templates.xml
+++ b/addons/website_version/views/website_version_templates.xml
@@ -11,14 +11,6 @@
                                     <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu version_menu" role="menu">
-                            <li class="dropdown-header" style="text-transform: uppercase;">All versions</li>
-                            <t t-if="website.get_current_version()[0] == 0 ">
-                                <li><a href="#" data-action="change_version"><b>Master</b></a></li>
-                            </t>
-                            <t t-if="website.get_current_version()[0] != 0 ">
-                                <li><a href="#" data-action="change_version">Master</a></li>
-                            </t>
-                            <li class="first_divider divider"> </li>
                             <t t-if="website.get_current_version()[0] == 0 ">
                                 <li><a href="#" data-action="duplicate_version">New Version</a></li>
                             </t>
@@ -28,6 +20,14 @@
                                 <li><a href="#" data-action="diff_version" groups="base.group_no_one">List Modified Pages</a></li>
                             </t>
                             <li class="divider o_publish_version"> </li>
+                            <li class="dropdown-header" style="text-transform: uppercase;">All versions</li>
+                            <t t-if="website.get_current_version()[0] == 0 ">
+                                <li><a href="#" data-action="change_version"><b>Master</b></a></li>
+                            </t>
+                            <t t-if="website.get_current_version()[0] != 0 ">
+                                <li><a href="#" data-action="change_version">Master</a></li>
+                            </t>
+                            <li class="first_divider divider"> </li>
                             <li class="create_experiment"><a href="#" data-action="create_experiment">Launch A/B tests</a></li>
                         </ul>
                     </li>