diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 1881c8b6608..0aed1a2aadd 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -39,7 +39,7 @@
 
         <record id="free_delivery_carrier" model="delivery.carrier">
             <field name="name">Free delivery charges</field>
-            <field name="normal_price">10</field>
+            <field name="normal_price">0</field>
             <field name="free_if_more_than">True</field>
             <field name="amount">1000</field>
             <field name="partner_id" ref="res_partner_23"/>
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index b6ce5ad1621..f58bd048e80 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -348,8 +348,6 @@
                     }
                     function executeStep (step) {
                         // check if they are a cycle
-                        console.log(window.localStorage.getItem("test-report"));
-
                         var lastStep = window.localStorage.getItem(testId);
                         var tryStep = lastStep != step.stepId ? 0 : (+(window.localStorage.getItem("test-last-"+testId) || 0) + 1);
                         window.localStorage.setItem("test-last-"+testId, tryStep);
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index a4dcf8cf434..09cdf2b37e0 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -47,7 +47,8 @@ class WebsiteUiSuite(unittest.TestSuite):
         self._ignore_filters = [
             # Ignore phantomjs warnings
             "*** WARNING:",
-
+            # Disabled because of the 'web_hello' addon
+            "hello",
             # Fixes an issue with PhantomJS 1.9.2 on OS X 10.9 (Mavericks)
             # cf. https://github.com/ariya/phantomjs/issues/11418
             "CoreText performance note",
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index c64cebee7e1..507a8ca1e72 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -9,9 +9,6 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
             if(!condition) {
                 var message = timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms";
                 console.log('{ "event": "error", "message": "'+message+'" }');
-                if (window.localStorage.getItem("test-report")) {
-                    console.log(JSON.parse(website.localStorage.getItem("test-report")));
-                }
                 console.log("Waiting for...\n"+ready);
                 phantom.exit(1);
             } else {
@@ -58,9 +55,7 @@ function run (test) {
         phantom.exit(1);
     };
     page.onConsoleMessage = function(message) {
-        /* Disabled because of the 'web_hello' addon */
-        //console.log(message);
-        //phantom.exit(1);
+        console.log(message);
     };
 
     page.onCallback = function(data) {
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b2a4d1eb57e..f429b68a5ad 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -336,6 +336,8 @@ class Ecommerce(http.Controller):
             index = random.randrange(0, len(suggested_ids))
             suggested_products.append(suggested_ids.pop(index))
 
+        context = dict(context or {}, pricelist=request.registry['website'].ecommerce_get_pricelist_id(cr, uid, None, context=context))
+
         values = {
             'int': int,
             'suggested_products': prod_obj.browse(cr, uid, suggested_products, context),
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 11ff6cf2efc..f52a409d244 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -158,10 +158,12 @@ class Website(orm.Model):
 
         order_id = self._ecommerce_create_quotation(cr, uid, context=context)
         request.httprequest.session['ecommerce_order_id'] = order_id
+        context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
         return SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context)
 
     def ecommerce_get_current_order(self, cr, uid, context=None):
         SaleOrder = self.pool.get('sale.order')
+        context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
         order_id = request.httprequest.session.get('ecommerce_order_id')
         if not order_id:
             request.httprequest.session['ecommerce_order_id'] = False
diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js
index 3281ee009d2..20461a7c07e 100644
--- a/addons/website_sale/static/src/js/website_sale_payment.js
+++ b/addons/website_sale/static/src/js/website_sale_payment.js
@@ -2,11 +2,11 @@ $(document).ready(function () {
 
     // When choosing an acquirer, display its Pay Now button
     var $payment = $("#payment_method");
-    $payment.find("input[name='acquirer']").click(function (ev) {
-        var payment_id = $(ev.currentTarget).val();
-        $("div.oe_sale_acquirer_button[data-id]", $payment).addClass("hidden");
-        $("div.oe_sale_acquirer_button[data-id='"+payment_id+"']", $payment).removeClass("hidden");
-    });
-    $payment.find("input[name='acquirer']:checked").click();
+    $payment.on("click", "input[name='acquirer']", function (ev) {
+            var payment_id = $(ev.currentTarget).val();
+            $("div.oe_sale_acquirer_button[data-id]", $payment).addClass("hidden");
+            $("div.oe_sale_acquirer_button[data-id='"+payment_id+"']", $payment).removeClass("hidden");
+        })
+        .find("#payment_method input[name='acquirer']:checked").click();
 
 });
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 096d554441b..e11647ce462 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -945,18 +945,20 @@
             </div>
           </div>
 
-          <div class="js_payment mb64" t-if="acquirers" id="payment_method">
+          <div class="js_payment mb64 row" t-if="acquirers" id="payment_method">
               <div class="col-lg-5 col-sm-6">
                   <h4>Payment Method:</h4>
-                  <t t-foreach="acquirers or []" t-as="acquirer">
-                      <label t-if="acquirer.button" class="oe_sale_acquirer_logo" style="display: block;">
+                  <ul class="list-unstyled">
+                    <li t-foreach="acquirers or []" t-as="acquirer">
+                      <label t-if="acquirer.button">
                           <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer"/>
                           <img class="media-object" style="width: 60px; display: inline-block;"
                               t-att-title="acquirer.name"
                               t-att-src="'/payment_acquirer_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
                               <span t-field="acquirer.name"/>
                       </label>
-                  </t>
+                    </li>
+                  </ul>
               </div>
               <div class="col-lg-3 col-sm-3">
                   <t t-foreach="acquirers or []" t-as="acquirer">
diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery.xml
index 46f04e70a38..7f37a0647e3 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery.xml
@@ -23,8 +23,8 @@
 
         <xpath expr="//div[@id='payment_method']" position="before">
             <div t-if="deliveries" class="row" id="delivery_carrier">
-                <h4>Choose your Delivery Method</h4>
                 <div class="col-lg-5 col-sm-6">
+                <h4>Choose your Delivery Method</h4>
                     <ul class="list-unstyled">
                         <li t-foreach="deliveries" t-as="delivery">
                             <label>