diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index a5f4013a7df..18a5724fb02 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -404,11 +404,7 @@ class Contact(orm.AbstractModel):
         field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
         value = werkzeug.utils.escape( field_browse.name_get()[0][1] )
 
-        IMD = self.pool["ir.model.data"]
-        model, id = IMD.get_object_reference(cr, uid, "website", "contact")
-        view = self.pool["ir.ui.view"].browse(cr, uid, id, context=context)
-
-        html = view.render({
+        val = {
             'name': value.split("\n")[0],
             'address': werkzeug.utils.escape("\n".join(value.split("\n")[1:])),
             'phone': field_browse.phone,
@@ -417,7 +413,9 @@ class Contact(orm.AbstractModel):
             'email': field_browse.email,
             'fields': opf,
             'options': options
-        }, engine='website.qweb', context=context)
+        }
+
+        html = self.pool["ir.ui.view"].render(cr, uid, "website.contact", val, engine='website.qweb', context=context)
 
         return ir_qweb.HTMLSafe(html)
 
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 25980633fd2..5f4cd8978c2 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -463,6 +463,10 @@
             $(window).on('resize', _.debounce(this.check_height.bind(this), 50));
             this.check_height();
 
+            if (website.is_editable_button) {
+                this.$("button[data-action=edit]").removeClass("hidden");
+            }
+
             return $.when(
                 this._super.apply(this, arguments),
                 this.rte.appendTo(this.$('#website-top-edit .nav.pull-right'))
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index e333e2e451e..fd84c7c893e 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -3,11 +3,12 @@
 
     var website = openerp.website;
     website.is_editable = true;
+    website.is_editable_button = true;
+    
     website.EditorBar.include({
         start: function() {
             var res = this._super();
             this.$("a[data-action=new_page]").parents("li").removeClass("hidden");
-            this.$("button[data-action=edit]").removeClass("hidden");
             this.$(".oe_content_menu li.divider").removeClass("hidden");
             return res;
         },
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 78a6202c58c..e232a050b27 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -67,6 +67,7 @@
     var dom_ready = website.dom_ready = $.Deferred();
     $(document).ready(function () {
         website.is_editable = website.is_editable || $('html').data('editable');
+        website.is_editable_button= website.is_editable_button || $('html').data('editable');
         dom_ready.resolve();
     });
 
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 1d28df08c75..89f226adfae 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -76,6 +76,9 @@
         hack_to_add_snippet_id();
     });
 
+    // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
+    // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
+
     website.snippet.styles = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 00dba53fe55..eef3d1b8ae7 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -366,7 +366,7 @@
                         overlapsCrash = setTimeout(function () {
                             window.localStorage.removeItem(testId);
                             throw "Test: '" + testId + "' can't resolve stape: '" + step.stepId + "'";
-                        }, step.delay || defaultDelay);
+                        }, (step.delay || defaultDelay) + 500);
 
                         var $element = $(step.element);
                         if (step.triggers) step.triggers(next);
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 812f8902c65..399e5e731b2 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -13,9 +13,13 @@
             var self = this;
             this.initial_content = {};
             return this._super.apply(this, arguments).then(function () {
+                self.$("button[data-action=edit]").removeClass("hidden");
                 self.$('button[data-action=edit]')
-                    .text("Translate")
-                    .after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
+                    .text("Translate");
+                if (website.is_editable_button) {
+                    self.$('button[data-action=edit]')
+                        .after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
+                }
                 self.$('.js_hide_on_translate').hide();
             });
         },
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 7a1a8f92ad4..2a05530cde6 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -239,10 +239,10 @@
     </xpath>
 </template>
 
-<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
+<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In" groups="base.group_public">
     <xpath expr="//ul[@id='top_menu']" position="inside">
-        <li class="divider" groups="base.group_public"/>
-        <li groups="base.group_public">
+        <li class="divider"/>
+        <li>
             <a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
                 <b>Sign in</b>
             </a>
@@ -725,7 +725,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="contact">
     <address t-ignore="true">
-        <div t-att-class='"" if "name" in fields else "css_non_editable_mode_hidden"'><span t-esc="name"/></div>
+        <div t-attf-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span t-esc="name"/></div>
         <div class='css_editable_mode_hidden'>
             <div t-if="address and 'address' in fields">
                 <i class='fa fa-map-marker'/>
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 0ab97cca0f9..2570b6fdfb7 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -7,10 +7,8 @@
     website.is_editable = true;
     website.EditorBar.include({
         start: function() {
+            website.is_editable_button = website.is_editable_button || !!$("#wrap.js_blog").size();
             var res = this._super();
-            if ($("#wrap.js_blog").size()) {
-                this.$("button[data-action=edit]").removeClass("hidden");
-            }
             this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
             return res;
         },
diff --git a/addons/website_event/static/src/js/website_event.editor.js b/addons/website_event/static/src/js/website_event.editor.js
index a6b6cbde790..056d6ed37e4 100644
--- a/addons/website_event/static/src/js/website_event.editor.js
+++ b/addons/website_event/static/src/js/website_event.editor.js
@@ -7,10 +7,8 @@
     website.is_editable = true;
     website.EditorBar.include({
         start: function() {
+            website.is_editable_button = website.is_editable_button || !!$("#wrap.js_event").size();
             var res = this._super();
-            if ($("#wrap.js_event").size()) {
-                this.$("button[data-action=edit]").removeClass("hidden");
-            }
             this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
             return res;
         },
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 663727db27f..39c3ca05a51 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -203,7 +203,7 @@
                         </t>
                     </ol>
                 </div>
-                <div class="col-sm-5">
+                <div class="col-sm-5" groups="event.group_event_manager">
                     <t t-call="website.publish_management">
                         <t t-set="object" t-value="event"/>
                         <t t-set="publish_edit" t-value="True"/>
diff --git a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js
index 6b727be806b..a1d95b888b4 100644
--- a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js
+++ b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js
@@ -6,10 +6,8 @@
     website.is_editable = true;
     website.EditorBar.include({
         start: function() {
+            website.is_editable_button = website.is_editable_button || !!$("#wrap.js_hr_recruitment").size();
             var res = this._super();
-            if ($("#wrap.js_hr_recruitment").size()) {
-                this.$("button[data-action=edit]").removeClass("hidden");
-            }
             this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
             return res;
         },
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index a1908d5d08c..22166cadeea 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -288,8 +288,9 @@
                 {
                     stepId:    'pay-checkout-product',
                     element:   'button:contains("Pay Now")',
-                    trigger:   'click',
-
+                    trigger: {
+                        url:   /shop\/confirmation\//,
+                    },
                 },
                 {
                     stepId:    'end-test',
diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js
index e6a35cf794c..1f41752dc7e 100644
--- a/addons/website_sale/static/src/js/website_sale.editor.js
+++ b/addons/website_sale/static/src/js/website_sale.editor.js
@@ -7,10 +7,8 @@
     website.is_editable = true;
     website.EditorBar.include({
         start: function() {
+            website.is_editable_button = website.is_editable_button || !!$("#wrap.js_sale").size();
             var res = this._super();
-            if ($("#wrap.js_sale").size()) {
-                this.$("button[data-action=edit]").removeClass("hidden");
-            }
             this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
             return res;
         },
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
index 5d013b77553..747dc01b569 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
+++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
@@ -15,16 +15,9 @@ testRunner.run(function websiteSaleTest (page, timeout) {
             window.openerp.website.TestConsole.test('shoptest').run(true);
         });
         waitFor(function testExecuted () {
-            var after = page.evaluate(function () {
-                return window.$ && $('button[data-action=edit]').is(":visible") && {
-                    image: $('#wrap [data-snippet-id=image-text]').length,
-                    text: $('#wrap [data-snippet-id=text-block]').length,
-                };
-            });
-            var result = after && (after.image === 1) && (after.text === 1);
-            return result;
+            return page.evaluate(function () { return window.$ && $('#wrap:contains("Order Confirmed")').length; });
         }, function finish () {
-            console.log('{ "event": "success" }');
+            console.log('{ "website_sale": "success" }');
             phantom.exit();
         }, 4*timeout/5);
     }, timeout/5);
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index ae740484537..f7f3ba68f50 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -282,7 +282,7 @@
                   <t t-call="website_sale.search" />
               </form>
             </div>
-            <div class="col-sm-4">
+            <div class="col-sm-4" groups="base.group_sale_manager">
                 <t t-call="website.publish_management">
                   <t t-set="object" t-value="product"/>
                   <t t-set="publish_edit" t-value="True"/>