diff --git a/lib/common.js b/lib/common.js
index 31101f7..4972300 100755
--- a/lib/common.js
+++ b/lib/common.js
@@ -131,15 +131,15 @@ const updateTotalCart = (req, res) => {
     // Update the total items in cart for the badge
     req.session.totalCartItems = Object.keys(req.session.cart).length;
 
+    // Net cart amount
+    const netCartAmount = req.session.totalCartAmount - req.session.totalCartShipping || 0;
+
     // Calculate shipping using the loaded module
-    const shippingCost = config.modules.loaded.shipping.calculateShipping(req.session.totalCartAmount, config);
-    if(shippingCost > 0){
-        req.session.totalCartShipping = parseInt(shippingCost);
-        req.session.totalCartAmount = req.session.totalCartAmount + parseInt(shippingCost);
-        req.session.shippingCostApplied = true;
-    }else{
-        req.session.shippingCostApplied = false;
-    }
+    config.modules.loaded.shipping.calculateShipping(
+        netCartAmount,
+        config,
+        req
+    );
 };
 
 const emptyCart = async (req, res, type, customMessage) => {
diff --git a/lib/modules/shipping-basic.js b/lib/modules/shipping-basic.js
index 65a069a..7858e8c 100644
--- a/lib/modules/shipping-basic.js
+++ b/lib/modules/shipping-basic.js
@@ -1,15 +1,40 @@
-const shippingAmount = 10;
+const domesticShippingAmount = 10;
+const internationalShippingAmount = 25;
 const freeThreshold = 100;
+const shippingFromCountry = 'Australia';
 
-const calculateShipping = (amount, config) => {
+const calculateShipping = (amount, config, req) => {
     // When set to instore shipping is not applicable.
     if(config.paymentGateway === 'instore'){
-        return 0;
+        // Update message and amount
+        req.session.shippingMessage = 'Instore pickup';
+        req.session.totalCartShipping = 0;
+        return;
     }
+
     if(amount >= freeThreshold){
-        return 0;
+        req.session.shippingMessage = 'FREE shipping';
+        req.session.totalCartShipping = 0;
+        return;
     }
-    return shippingAmount;
+
+    // If there is no country set, we estimate shipping
+    if(!req.session.customerCountry){
+        req.session.shippingMessage = 'Estimated shipping';
+        req.session.totalCartShipping = domesticShippingAmount;
+        return;
+    }
+
+    // Check for international
+    if(req.session.customerCountry.toLowerCase() !== shippingFromCountry.toLowerCase()){
+        req.session.shippingMessage = 'International shipping';
+        req.session.totalCartShipping = internationalShippingAmount;
+        return;
+    }
+
+    // Domestic shipping
+    req.session.shippingMessage = 'Domestic shipping';
+    req.session.totalCartShipping = domesticShippingAmount;
 };
 
 module.exports = {
diff --git a/public/javascripts/expressCart.js b/public/javascripts/expressCart.js
index 47d00f3..e9ebe02 100644
--- a/public/javascripts/expressCart.js
+++ b/public/javascripts/expressCart.js
@@ -486,9 +486,9 @@ function updateCartDiv(){
 
         // Work out the shipping
         var shippingTotalAmt = numeral(session.totalCartShipping).format('0.00');
-        var shippingTotal = `<strong id="shipping-amount">${result.currencySymbol}${shippingTotalAmt}</strong>`;
-        if(shippingTotalAmt === 0){
-            shippingTotal = '<strong id="shipping-amount">FREE</strong>';
+        var shippingTotal = `${session.shippingMessage} :<strong id="shipping-amount">${result.currencySymbol}${shippingTotalAmt}</strong>`;
+        if(session.totalCartShipping === 0){
+            shippingTotal = `<strong id="shipping-amount">${session.shippingMessage}</strong>`;
         }
 
         // If the cart has contents
@@ -550,10 +550,10 @@ function updateCartDiv(){
                 </div>`;
             });
 
-            $('#cartBodyWrapper').html(productHtml);
+            $('.cartBodyWrapper').html(productHtml);
             $('#cart-count').text(session.totalCartItems);
         }else{
-            $('#cartBodyWrapper').html('');
+            $('.cartBodyWrapper').html('');
         }
 
         // Set the totals section
@@ -561,7 +561,7 @@ function updateCartDiv(){
             <div class="row">
                 <div class="cart-contents-shipping col-md-12 no-pad-right">
                     <div class="text-right">
-                        Shipping: ${shippingTotal}
+                        ${shippingTotal}
                     </div>
                     <div class="text-right">
                         Total:
@@ -579,11 +579,11 @@ function updateCartDiv(){
 
         // Set depending on cart contents
         if(cart){
-            $('#cartTotalsWrapper').html(cartTotalsHtml);
-            $('#cart-buttons').removeClass('d-none');
+            $('.cartTotalsWrapper').html(cartTotalsHtml);
+            $('.cart-buttons').removeClass('d-none');
         }else{
-            $('#cartTotalsWrapper').html(cartTotalsEmptyHtml);
-            $('#cart-buttons').addClass('d-none');
+            $('.cartTotalsWrapper').html(cartTotalsEmptyHtml);
+            $('.cart-buttons').addClass('d-none');
         }
     })
     .fail(function(result){
diff --git a/public/javascripts/expressCart.min.js b/public/javascripts/expressCart.min.js
index 7722eb6..9ec7361 100644
--- a/public/javascripts/expressCart.min.js
+++ b/public/javascripts/expressCart.min.js
@@ -1 +1 @@
-function deleteFromCart(t){$.ajax({method:"POST",url:"/product/removefromcart",data:{productId:t.attr("data-id")}}).done(function(t){showNotification(t.message,"success"),updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}function cartUpdate(t){$(t).val()>0?""!==$(t).val()&&updateCart(t):$(t).val(1)}function updateCart(t){$.ajax({method:"POST",url:"/product/updatecart",data:{productId:t.attr("data-id"),quantity:t.val()}}).done(function(t){updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger",!0)})}function getSelectedOptions(){var t={};return $(".product-opt").each(function(){var a=$(this).val().trim(),e=$(this).attr("data-label"),n=$(this).attr("name"),o=$(this).attr("type");o||(t[n]={label:e,name:n,value:a}),"radio"===o&&(t[n]={label:e,name:n,value:$('input[name="'+n+'"]:checked').val()}),"checkbox"===o&&(t[n]={label:e,name:n,value:$('input[name="'+$(this).attr("name")+'"]').is(":checked")})}),t}function updateCartDiv(){$.ajax({method:"GET",url:"/checkout/cartdata"}).done(function(t){var a=t.cart,e=t.session,n="",o=numeral(e.totalCartAmount).format("0.00"),i=numeral(e.totalCartShipping).format("0.00"),r=`<strong id="shipping-amount">${t.currencySymbol}${i}</strong>`;0===i&&(r='<strong id="shipping-amount">FREE</strong>'),a?($("#cart-empty").empty(),Object.keys(a).forEach(function(e){var o=a[e],i=numeral(o.totalItemPrice).format("0.00"),r="",s=1;Object.keys(o.options).forEach(function(t){var a=o.options[t];s===Object.keys(o.options).length?r+=`<strong>${upperFirst(a.name)}</strong>: ${a.value}`:r+=`<strong>${upperFirst(a.name)}</strong>: ${a.value} / `,s++});var c=`<img class="img-fluid" src="/uploads/placeholder.png" alt="${o.title} product image"></img>`;o.productImage&&(c=`<img class="img-fluid" src="${o.productImage}" alt="${o.title} product image"></img>`),n+=`\n                <div class="d-flex flex-row bottom-pad-15">\n                    <div class="col-4 col-md-3">\n                        ${c}\n                    </div>\n                    <div class="col-12 col-md-7">\n                        <div class="row h-200">\n                            <div class="col-sm-12 text-left no-pad-left">\n                                <h6><a href="/product/${o.link}">${o.title}</a></h6>\n                            </div>\n                            <div class="col-sm-12 text-left no-pad-left">\n                                ${r}\n                            </div>\n                            <div class="col-md-8 no-pad-left">\n                                <div class="input-group">\n                                    <div class="input-group-prepend">\n                                        <button class="btn btn-outline-primary btn-qty-minus" type="button">-</button>\n                                    </div>\n                                    <input type="number" class="form-control cart-product-quantity text-center" id="${e}-qty" data-id="${e}" maxlength="2" value="${o.quantity}">\n                                    <div class="input-group-append">\n                                        <button class="btn btn-outline-primary btn-qty-add" type="button">+</button>\n                                    </div>\n                                </div>\n                            </div>\n                            <div class="col-md-4 text-right">\n                                <button class="btn btn-outline-danger btn-delete-from-cart" data-id="${e}" type="button"><i class="far fa-trash-alt" data-id="${e}" aria-hidden="true"></i></button>\n                            </div>\n                        </div>\n                    </div>\n                    <div class="col-12 col-md-2 align-self-center text-right no-pad-right">\n                        <strong class="my-auto">${t.currencySymbol}${i}</strong>\n                    </div>\n                </div>`}),$("#cartBodyWrapper").html(n),$("#cart-count").text(e.totalCartItems)):$("#cartBodyWrapper").html("");var s=`\n            <div class="row">\n                <div class="cart-contents-shipping col-md-12 no-pad-right">\n                    <div class="text-right">\n                        Shipping: ${r}\n                    </div>\n                    <div class="text-right">\n                        Total:\n                        <strong id="total-cart-amount">${t.currencySymbol}${o}</strong>\n                    </div>\n                </div>\n            </div>`;a?($("#cartTotalsWrapper").html(s),$("#cart-buttons").removeClass("d-none")):($("#cartTotalsWrapper").html('\n            <div id="cart-empty" class="row">\n                <div class="cart-contents-shipping col-md-12 no-pad-right">\n                    Cart empty\n                </div>\n            </div>'),$("#cart-buttons").addClass("d-none"))}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}function upperFirst(t){return t.replace(/^\w/,t=>t.toUpperCase())}$(document).ready(function(){if($(window).width()<768&&($(".menu-side").on("click",function(t){t.preventDefault(),$('.menu-side li:not(".active")').slideToggle()}),$('.menu-side li:not(".active")').hide(),$(".menu-side>.active").html('<i class="fa fa-bars" aria-hidden="true"></i>'),$(".menu-side>.active").addClass("menu-side-mobile"),0===$("#navbar ul li").length&&$("#navbar").hide(),$("#offcanvasClose").hide()),$("#userSetupForm").validator().on("submit",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/admin/setup_action",data:{usersName:$("#usersName").val(),userEmail:$("#userEmail").val(),userPassword:$("#userPassword").val()}}).done(function(t){showNotification(t.message,"success",!1,"/admin/login")}).fail(function(t){showNotification(t.responseJSON.message,"danger")}))}),$(document).on("click",".menu-btn",function(t){t.preventDefault(),$("body").addClass("pushy-open-right")}),$("table").each(function(){$(this).addClass("table table-hover")}),$("#productTags").length&&$("#productTags").tokenfield(),$(document).on("click",".dashboard_list",function(t){window.document.location=$(this).attr("href")}).hover(function(){$(this).toggleClass("hover")}),$(document).on("click",".btn-qty-minus",function(t){t.preventDefault();var a=$(t.target).parent().parent().find(".cart-product-quantity");$(a).val(parseInt(a.val())-1),cartUpdate(a)}),$(document).on("click",".btn-qty-add",function(t){t.preventDefault();var a=$(t.target).parent().parent().find(".cart-product-quantity");$(a).val(parseInt(a.val())+1),cartUpdate(a)}),$(document).on("click",".btn-delete-from-cart",function(t){deleteFromCart($(t.target))}),$("#pager").length){var t=$("#pageNum").val(),a=$("#productsPerPage").val(),e=$("#totalProductCount").val(),n=$("#paginateUrl").val(),o=$("#searchTerm").val();""!==o&&(o+="/");var i="/"+n+"/"+o+"{{number}}",r=Math.ceil(e/a);parseInt(e)>parseInt(a)&&($("#pager").bootpag({total:r,page:t,maxVisible:5,href:i,wrapClass:"pagination",prevClass:"page-item previous",nextClass:"page-item next",activeClass:"page-item active"}),$("#pager a").each(function(){$(this).addClass("page-link")}))}if($("#customerLogout").on("click",function(t){$.ajax({method:"POST",url:"/customer/logout",data:{}}).done(function(t){location.reload()})}),$("#customerForgotten").validator().on("submit",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/customer/forgotten_action",data:{email:$("#email").val()}}).done(function(t){showNotification(t.message,"success")}).fail(function(t){t.message?showNotification(t.responseJSON.message,"danger"):showNotification(t.responseText,"danger")}))}),$(document).on("click","#createAccountCheckbox",function(t){$("#newCustomerPassword").prop("required",$("#createAccountCheckbox").prop("checked"))}),$("#checkoutInformation").validator().on("click",function(t){if(t.preventDefault(),0===$("#shipping-form").validator("validate").has(".has-error").length){var a="/customer/save";$("#createAccountCheckbox").prop("checked")&&(a="/customer/create"),$.ajax({method:"POST",url:a,data:{email:$("#shipEmail").val(),firstName:$("#shipFirstname").val(),lastName:$("#shipLastname").val(),address1:$("#shipAddr1").val(),address2:$("#shipAddr2").val(),country:$("#shipCountry").val(),state:$("#shipState").val(),postcode:$("#shipPostcode").val(),phone:$("#shipPhoneNumber").val(),password:$("#newCustomerPassword").val(),orderComment:$("#orderComment").val()}}).done(function(){window.location="/checkout/shipping"}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}}),$("#loginForm").on("click",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/admin/login_action",data:{email:$("#email").val(),password:$("#password").val()}}).done(function(t){window.location="/admin"}).fail(function(t){showNotification(t.responseJSON.message,"danger")})),t.preventDefault()}),$("#customerLogin").on("click",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/customer/login_action",data:{loginEmail:$("#customerLoginEmail").val(),loginPassword:$("#customerLoginPassword").val()}}).done(function(t){var a=t.customer;$("#shipEmail").val(a.email),$("#shipFirstname").val(a.firstName),$("#shipLastname").val(a.lastName),$("#shipAddr1").val(a.address1),$("#shipAddr2").val(a.address2),$("#shipCountry").val(a.country),$("#shipState").val(a.state),$("#shipPostcode").val(a.postcode),$("#shipPhoneNumber").val(a.phone),location.reload()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})),t.preventDefault()}),$(document).on("click",".image-next",function(t){var a=$(".thumbnail-image"),e=0,n=0;$(".thumbnail-image").each(function(){$("#product-title-image").attr("src")===$(this).attr("src")&&(n=e+1===a.length||e+1<0?0:e+1),e++}),$("#product-title-image").attr("src",$(a).eq(n).attr("src"))}),$(document).on("click",".image-prev",function(t){var a=$(".thumbnail-image"),e=0,n=0;$(".thumbnail-image").each(function(){$("#product-title-image").attr("src")===$(this).attr("src")&&(n=e-1===a.length||e-1<0?a.length-1:e-1),e++}),$("#product-title-image").attr("src",$(a).eq(n).attr("src"))}),$(document).on("click",".product-add-to-cart",function(t){var a=getSelectedOptions();parseInt($("#product_quantity").val())<0&&$("#product_quantity").val(0),$.ajax({method:"POST",url:"/product/addtocart",data:{productId:$("#productId").val(),productQuantity:$("#product_quantity").val(),productOptions:JSON.stringify(a),productComment:$("#product_comment").val()}}).done(function(t){showNotification(t.message,"success"),updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}),$(".cart-product-quantity").on("focusout",function(t){cartUpdate($(t.target))}),$(document).on("click",".pushy-link",function(t){$("body").removeClass("pushy-open-right")}),$(document).on("click",".add-to-cart",function(t){var a="/product/"+$(this).attr("data-id");$(this).attr("data-link")&&(a="/product/"+$(this).attr("data-link")),"true"===$(this).attr("data-has-options")?window.location=a:$.ajax({method:"POST",url:"/product/addtocart",data:{productId:$(this).attr("data-id")}}).done(function(t){showNotification(t.message,"success"),updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}),$(document).on("click","#empty-cart",function(t){$.ajax({method:"POST",url:"/product/emptycart"}).done(function(t){updateCartDiv(),showNotification(t.message,"success",!0)})}),$(".qty-btn-minus").on("click",function(){var t=parseInt($("#product_quantity").val())-1;$("#product_quantity").val(t>0?t:1)}),$(".qty-btn-plus").on("click",function(){$("#product_quantity").val(parseInt($("#product_quantity").val())+1)}),$(".thumbnail-image").on("click",function(){$("#product-title-image").attr("src",$(this).attr("src"))}),$(document).on("click","#btn_search_reset",function(t){window.location.replace("/")}),$(document).on("click","#btn_search",function(t){t.preventDefault(),""===$("#frm_search").val().trim()?showNotification("Please enter a search value","danger"):window.location.href="/search/"+$("#frm_search").val()}),""!==$("#input_notify_message").val()){var s=$("#input_notify_message").val(),c=$("#input_notify_messageType").val();$("#input_notify_message").val(""),$("#input_notify_messageType").val(""),showNotification(s,c||"danger",!1)}});
\ No newline at end of file
+function deleteFromCart(t){$.ajax({method:"POST",url:"/product/removefromcart",data:{productId:t.attr("data-id")}}).done(function(t){showNotification(t.message,"success"),updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}function cartUpdate(t){$(t).val()>0?""!==$(t).val()&&updateCart(t):$(t).val(1)}function updateCart(t){$.ajax({method:"POST",url:"/product/updatecart",data:{productId:t.attr("data-id"),quantity:t.val()}}).done(function(t){updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger",!0)})}function getSelectedOptions(){var t={};return $(".product-opt").each(function(){var a=$(this).val().trim(),e=$(this).attr("data-label"),n=$(this).attr("name"),o=$(this).attr("type");o||(t[n]={label:e,name:n,value:a}),"radio"===o&&(t[n]={label:e,name:n,value:$('input[name="'+n+'"]:checked').val()}),"checkbox"===o&&(t[n]={label:e,name:n,value:$('input[name="'+$(this).attr("name")+'"]').is(":checked")})}),t}function updateCartDiv(){$.ajax({method:"GET",url:"/checkout/cartdata"}).done(function(t){var a=t.cart,e=t.session,n="",o=numeral(e.totalCartAmount).format("0.00"),i=numeral(e.totalCartShipping).format("0.00"),r=`${e.shippingMessage} :<strong id="shipping-amount">${t.currencySymbol}${i}</strong>`;0===e.totalCartShipping&&(r=`<strong id="shipping-amount">${e.shippingMessage}</strong>`),a?($("#cart-empty").empty(),Object.keys(a).forEach(function(e){var o=a[e],i=numeral(o.totalItemPrice).format("0.00"),r="",s=1;Object.keys(o.options).forEach(function(t){var a=o.options[t];s===Object.keys(o.options).length?r+=`<strong>${upperFirst(a.name)}</strong>: ${a.value}`:r+=`<strong>${upperFirst(a.name)}</strong>: ${a.value} / `,s++});var c=`<img class="img-fluid" src="/uploads/placeholder.png" alt="${o.title} product image"></img>`;o.productImage&&(c=`<img class="img-fluid" src="${o.productImage}" alt="${o.title} product image"></img>`),n+=`\n                <div class="d-flex flex-row bottom-pad-15">\n                    <div class="col-4 col-md-3">\n                        ${c}\n                    </div>\n                    <div class="col-12 col-md-7">\n                        <div class="row h-200">\n                            <div class="col-sm-12 text-left no-pad-left">\n                                <h6><a href="/product/${o.link}">${o.title}</a></h6>\n                            </div>\n                            <div class="col-sm-12 text-left no-pad-left">\n                                ${r}\n                            </div>\n                            <div class="col-md-8 no-pad-left">\n                                <div class="input-group">\n                                    <div class="input-group-prepend">\n                                        <button class="btn btn-outline-primary btn-qty-minus" type="button">-</button>\n                                    </div>\n                                    <input type="number" class="form-control cart-product-quantity text-center" id="${e}-qty" data-id="${e}" maxlength="2" value="${o.quantity}">\n                                    <div class="input-group-append">\n                                        <button class="btn btn-outline-primary btn-qty-add" type="button">+</button>\n                                    </div>\n                                </div>\n                            </div>\n                            <div class="col-md-4 text-right">\n                                <button class="btn btn-outline-danger btn-delete-from-cart" data-id="${e}" type="button"><i class="far fa-trash-alt" data-id="${e}" aria-hidden="true"></i></button>\n                            </div>\n                        </div>\n                    </div>\n                    <div class="col-12 col-md-2 align-self-center text-right no-pad-right">\n                        <strong class="my-auto">${t.currencySymbol}${i}</strong>\n                    </div>\n                </div>`}),$(".cartBodyWrapper").html(n),$("#cart-count").text(e.totalCartItems)):$(".cartBodyWrapper").html("");var s=`\n            <div class="row">\n                <div class="cart-contents-shipping col-md-12 no-pad-right">\n                    <div class="text-right">\n                        ${r}\n                    </div>\n                    <div class="text-right">\n                        Total:\n                        <strong id="total-cart-amount">${t.currencySymbol}${o}</strong>\n                    </div>\n                </div>\n            </div>`;a?($(".cartTotalsWrapper").html(s),$(".cart-buttons").removeClass("d-none")):($(".cartTotalsWrapper").html('\n            <div id="cart-empty" class="row">\n                <div class="cart-contents-shipping col-md-12 no-pad-right">\n                    Cart empty\n                </div>\n            </div>'),$(".cart-buttons").addClass("d-none"))}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}function upperFirst(t){return t.replace(/^\w/,t=>t.toUpperCase())}$(document).ready(function(){if($(window).width()<768&&($(".menu-side").on("click",function(t){t.preventDefault(),$('.menu-side li:not(".active")').slideToggle()}),$('.menu-side li:not(".active")').hide(),$(".menu-side>.active").html('<i class="fa fa-bars" aria-hidden="true"></i>'),$(".menu-side>.active").addClass("menu-side-mobile"),0===$("#navbar ul li").length&&$("#navbar").hide(),$("#offcanvasClose").hide()),$("#userSetupForm").validator().on("submit",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/admin/setup_action",data:{usersName:$("#usersName").val(),userEmail:$("#userEmail").val(),userPassword:$("#userPassword").val()}}).done(function(t){showNotification(t.message,"success",!1,"/admin/login")}).fail(function(t){showNotification(t.responseJSON.message,"danger")}))}),$(document).on("click",".menu-btn",function(t){t.preventDefault(),$("body").addClass("pushy-open-right")}),$("table").each(function(){$(this).addClass("table table-hover")}),$("#productTags").length&&$("#productTags").tokenfield(),$(document).on("click",".dashboard_list",function(t){window.document.location=$(this).attr("href")}).hover(function(){$(this).toggleClass("hover")}),$(document).on("click",".btn-qty-minus",function(t){t.preventDefault();var a=$(t.target).parent().parent().find(".cart-product-quantity");$(a).val(parseInt(a.val())-1),cartUpdate(a)}),$(document).on("click",".btn-qty-add",function(t){t.preventDefault();var a=$(t.target).parent().parent().find(".cart-product-quantity");$(a).val(parseInt(a.val())+1),cartUpdate(a)}),$(document).on("click",".btn-delete-from-cart",function(t){deleteFromCart($(t.target))}),$("#pager").length){var t=$("#pageNum").val(),a=$("#productsPerPage").val(),e=$("#totalProductCount").val(),n=$("#paginateUrl").val(),o=$("#searchTerm").val();""!==o&&(o+="/");var i="/"+n+"/"+o+"{{number}}",r=Math.ceil(e/a);parseInt(e)>parseInt(a)&&($("#pager").bootpag({total:r,page:t,maxVisible:5,href:i,wrapClass:"pagination",prevClass:"page-item previous",nextClass:"page-item next",activeClass:"page-item active"}),$("#pager a").each(function(){$(this).addClass("page-link")}))}if($("#customerLogout").on("click",function(t){$.ajax({method:"POST",url:"/customer/logout",data:{}}).done(function(t){location.reload()})}),$("#customerForgotten").validator().on("submit",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/customer/forgotten_action",data:{email:$("#email").val()}}).done(function(t){showNotification(t.message,"success")}).fail(function(t){t.message?showNotification(t.responseJSON.message,"danger"):showNotification(t.responseText,"danger")}))}),$(document).on("click","#createAccountCheckbox",function(t){$("#newCustomerPassword").prop("required",$("#createAccountCheckbox").prop("checked"))}),$("#checkoutInformation").validator().on("click",function(t){if(t.preventDefault(),0===$("#shipping-form").validator("validate").has(".has-error").length){var a="/customer/save";$("#createAccountCheckbox").prop("checked")&&(a="/customer/create"),$.ajax({method:"POST",url:a,data:{email:$("#shipEmail").val(),firstName:$("#shipFirstname").val(),lastName:$("#shipLastname").val(),address1:$("#shipAddr1").val(),address2:$("#shipAddr2").val(),country:$("#shipCountry").val(),state:$("#shipState").val(),postcode:$("#shipPostcode").val(),phone:$("#shipPhoneNumber").val(),password:$("#newCustomerPassword").val(),orderComment:$("#orderComment").val()}}).done(function(){window.location="/checkout/shipping"}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}}),$("#loginForm").on("click",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/admin/login_action",data:{email:$("#email").val(),password:$("#password").val()}}).done(function(t){window.location="/admin"}).fail(function(t){showNotification(t.responseJSON.message,"danger")})),t.preventDefault()}),$("#customerLogin").on("click",function(t){t.isDefaultPrevented()||(t.preventDefault(),$.ajax({method:"POST",url:"/customer/login_action",data:{loginEmail:$("#customerLoginEmail").val(),loginPassword:$("#customerLoginPassword").val()}}).done(function(t){var a=t.customer;$("#shipEmail").val(a.email),$("#shipFirstname").val(a.firstName),$("#shipLastname").val(a.lastName),$("#shipAddr1").val(a.address1),$("#shipAddr2").val(a.address2),$("#shipCountry").val(a.country),$("#shipState").val(a.state),$("#shipPostcode").val(a.postcode),$("#shipPhoneNumber").val(a.phone),location.reload()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})),t.preventDefault()}),$(document).on("click",".image-next",function(t){var a=$(".thumbnail-image"),e=0,n=0;$(".thumbnail-image").each(function(){$("#product-title-image").attr("src")===$(this).attr("src")&&(n=e+1===a.length||e+1<0?0:e+1),e++}),$("#product-title-image").attr("src",$(a).eq(n).attr("src"))}),$(document).on("click",".image-prev",function(t){var a=$(".thumbnail-image"),e=0,n=0;$(".thumbnail-image").each(function(){$("#product-title-image").attr("src")===$(this).attr("src")&&(n=e-1===a.length||e-1<0?a.length-1:e-1),e++}),$("#product-title-image").attr("src",$(a).eq(n).attr("src"))}),$(document).on("click",".product-add-to-cart",function(t){var a=getSelectedOptions();parseInt($("#product_quantity").val())<0&&$("#product_quantity").val(0),$.ajax({method:"POST",url:"/product/addtocart",data:{productId:$("#productId").val(),productQuantity:$("#product_quantity").val(),productOptions:JSON.stringify(a),productComment:$("#product_comment").val()}}).done(function(t){showNotification(t.message,"success"),updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}),$(".cart-product-quantity").on("focusout",function(t){cartUpdate($(t.target))}),$(document).on("click",".pushy-link",function(t){$("body").removeClass("pushy-open-right")}),$(document).on("click",".add-to-cart",function(t){var a="/product/"+$(this).attr("data-id");$(this).attr("data-link")&&(a="/product/"+$(this).attr("data-link")),"true"===$(this).attr("data-has-options")?window.location=a:$.ajax({method:"POST",url:"/product/addtocart",data:{productId:$(this).attr("data-id")}}).done(function(t){showNotification(t.message,"success"),updateCartDiv()}).fail(function(t){showNotification(t.responseJSON.message,"danger")})}),$(document).on("click","#empty-cart",function(t){$.ajax({method:"POST",url:"/product/emptycart"}).done(function(t){updateCartDiv(),showNotification(t.message,"success",!0)})}),$(".qty-btn-minus").on("click",function(){var t=parseInt($("#product_quantity").val())-1;$("#product_quantity").val(t>0?t:1)}),$(".qty-btn-plus").on("click",function(){$("#product_quantity").val(parseInt($("#product_quantity").val())+1)}),$(".thumbnail-image").on("click",function(){$("#product-title-image").attr("src",$(this).attr("src"))}),$(document).on("click","#btn_search_reset",function(t){window.location.replace("/")}),$(document).on("click","#btn_search",function(t){t.preventDefault(),""===$("#frm_search").val().trim()?showNotification("Please enter a search value","danger"):window.location.href="/search/"+$("#frm_search").val()}),""!==$("#input_notify_message").val()){var s=$("#input_notify_message").val(),c=$("#input_notify_messageType").val();$("#input_notify_message").val(""),$("#input_notify_messageType").val(""),showNotification(s,c||"danger",!1)}});
\ No newline at end of file
diff --git a/routes/index.js b/routes/index.js
index 1a1095a..2f02484 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -95,7 +95,6 @@ router.get('/checkout/information', async (req, res, next) => {
         config: req.app.config,
         session: req.session,
         paymentType,
-        cartSize: 'part',
         cartClose: false,
         page: 'checkout-information',
         countryList,
@@ -124,12 +123,21 @@ router.get('/checkout/shipping', async (req, res, next) => {
         return;
     }
 
+    // Net cart amount
+    const netCartAmount = req.session.totalCartAmount - req.session.totalCartShipping || 0;
+
+    // Recalculate shipping
+    config.modules.loaded.shipping.calculateShipping(
+        netCartAmount,
+        config,
+        req
+    );
+
     // render the payment page
     res.render(`${config.themeViews}checkout-shipping`, {
         title: 'Checkout',
         config: req.app.config,
         session: req.session,
-        cartSize: 'part',
         cartClose: false,
         cartReadOnly: true,
         page: 'checkout-shipping',
@@ -146,7 +154,6 @@ router.get('/checkout/cart', (req, res) => {
 
     res.render(`${config.themeViews}checkout-cart`, {
         page: req.query.path,
-        cartSize: 'full',
         config,
         session: req.session,
         message: clearSessionValue(req.session, 'message'),
@@ -189,7 +196,6 @@ router.get('/checkout/payment', (req, res) => {
         session: req.session,
         paymentPage: true,
         paymentType,
-        cartSize: 'part',
         cartClose: true,
         cartReadOnly: true,
         page: 'checkout-information',
diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
index c8c72da..ee0da30 100644
--- a/views/layouts/layout.hbs
+++ b/views/layouts/layout.hbs
@@ -139,7 +139,7 @@
                         <div id="cart" class="col-md-12">
                         {{> (getTheme 'cart')}}
                         <div class="row">
-                        <div id="cart-buttons" class="col-sm-12 {{showCartButtons @root.session.cart}}">
+                        <div class="col-sm-12 {{showCartButtons @root.session.cart}} cart-buttons">
                             <button class="btn btn-outline-danger float-left" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
                             <a href="/checkout/information" class="btn btn-outline-primary float-right">Checkout</a>
                         </div>
diff --git a/views/themes/Cloth/cart.hbs b/views/themes/Cloth/cart.hbs
index b56c08e..427daba 100644
--- a/views/themes/Cloth/cart.hbs
+++ b/views/themes/Cloth/cart.hbs
@@ -1,7 +1,7 @@
 <div class="card top-marg-15 bottom-marg-15">
     <div class="card-body cart-body">
         <h5 class="card-title">{{ @root.__ "Cart contents" }}</h5>
-        <div id="cartBodyWrapper">
+        <div class="cartBodyWrapper">
             {{#each @root.session.cart}}
             <div class="d-flex flex-row bottom-pad-15">
                 <div class="col-4 col-md-3">
@@ -47,11 +47,11 @@
             </div>
             {{/each}}
         </div>
-        <div id="cartTotalsWrapper" class="container-fluid">
+        <div class="cartTotalsWrapper container-fluid">
             {{#if @root.session.cart}}
             <div class="row">
                 <div class="cart-contents-shipping col-md-12 no-pad-right">
-                    {{#ifCond @root.session.shippingCostApplied '===' true}}
+                    {{#ifCond @root.session.totalCartShipping '>' 0}}
                     <div class="text-right">
                         {{ @root.__ "Shipping" }}
                         <strong id="shipping-amount">{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartShipping}}</strong>
diff --git a/views/themes/Cloth/checkout-cart.hbs b/views/themes/Cloth/checkout-cart.hbs
index d264b87..afdffba 100644
--- a/views/themes/Cloth/checkout-cart.hbs
+++ b/views/themes/Cloth/checkout-cart.hbs
@@ -3,7 +3,7 @@
         <div id="cart" class="col-md-12">
             {{> (getTheme 'cart')}}
             <div class="row">
-                <div id="cart-buttons" class="col-sm-12 {{showCartButtons @root.session.cart}}">
+                <div class="col-sm-12 {{showCartButtons @root.session.cart}} cart-buttons">
                     <button class="btn btn-outline-danger float-left" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
                     <a href="/checkout/information" class="btn btn-outline-danger float-right">Checkout</a>
                 </div>
diff --git a/views/themes/Cloth/checkout-information.hbs b/views/themes/Cloth/checkout-information.hbs
index 01ffaea..c028ad2 100644
--- a/views/themes/Cloth/checkout-information.hbs
+++ b/views/themes/Cloth/checkout-information.hbs
@@ -88,7 +88,7 @@
             {{> (getTheme 'cart')}}
             {{#if @root.session.cart}}
             <div class="row">
-                <div id="cart-buttons" class="col-sm-12 {{showCartButtons @root.session.cart}}">
+                <div class="col-sm-12 {{showCartButtons @root.session.cart}} cart-buttons">
                     <button class="btn btn-outline-danger float-right" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
                 </div>
             {{/if}}
diff --git a/views/themes/Cloth/checkout-payment.hbs b/views/themes/Cloth/checkout-payment.hbs
index ce74d3d..39712d0 100644
--- a/views/themes/Cloth/checkout-payment.hbs
+++ b/views/themes/Cloth/checkout-payment.hbs
@@ -23,7 +23,7 @@
                         </li>
                     </ul>
                     <ul class="list-group bottom-pad-15">
-                        {{#if @root.session.shippingCostApplied}}
+                        {{#ifCond @root.session.totalCartShipping '>' 0}}
                         <li class="list-group-item">
                             <div class="row">
                                 <div class="col-md-6">
@@ -37,7 +37,7 @@
                         </li>
                         {{else}}
                         <li class="list-group-item">FREE shipping <span class="float-right"><a href="/checkout/shipping">Change</a></span></li>
-                        {{/if}}
+                        {{/ifCond}}
                     </ul>
                     <form id="shipping-form" class="shipping-form" action="/{{config.paymentGateway}}/checkout_action{{@root.paymentType}}" method="post" role="form" data-toggle="validator" novalidate="false">
                     {{#if session.customerPresent}}
diff --git a/views/themes/Cloth/checkout-shipping.hbs b/views/themes/Cloth/checkout-shipping.hbs
index 089c274..714baf0 100644
--- a/views/themes/Cloth/checkout-shipping.hbs
+++ b/views/themes/Cloth/checkout-shipping.hbs
@@ -14,11 +14,11 @@
                     <h5 class="card-title">{{ @root.__ "Shipping options" }}</h5>
                     {{#unless @root.session.shippingOptions}}
                         <ul class="list-group">
-                            {{#if @root.session.shippingCostApplied}}
-                            <li class="list-group-item">Standard shipping <span class="float-right"><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartShipping}}</strong></span></li>
+                            {{#ifCond @root.session.totalCartShipping '>' 0}}
+                            <li class="list-group-item">{{@root.session.shippingMessage}} <span class="float-right"><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartShipping}}</strong></span></li>
                             {{else}}
                             <li class="list-group-item">FREE shipping <span class="float-right"></li>
-                            {{/if}}
+                            {{/ifCond}}
                         </ul>
                     {{/unless}}
                 </div>
@@ -29,7 +29,7 @@
         <div id="cart" class="col-md-7 d-none d-sm-block">
             {{> (getTheme 'cart')}}
             <div class="row">
-                <div id="cart-buttons" class="col-sm-12 {{showCartButtons @root.session.cart}}">
+                <div class="col-sm-12 {{showCartButtons @root.session.cart}} cart-buttons">
                     <button class="btn btn-outline-danger float-right" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
                 </div>
             </div>