diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php
index c83aff515..acf88a5ed 100755
--- a/templates/default/I18n/en_US.php
+++ b/templates/default/I18n/en_US.php
@@ -44,7 +44,7 @@ return array(
     'Date' => 'Date',
     'Delete address' => 'Delete address',
     'Delivery address' => 'Delivery address',
-    'Delivery Informations' => 'Delivery Informations',
+    'Delivery Information' => 'Delivery Information',
     'Demo product description' => 'Demo product description',
     'Demo product title' => 'Demo product title',
     'Description' => 'Description',
@@ -105,7 +105,7 @@ return array(
     'Password Forgotten' => 'Password Forgotten',
     'Password' => 'Password',
     'per page' => 'per page',
-    'Personal Informations' => 'Personal Informations',
+    'Personal Information' => 'Personal Information',
     'Placeholder address label' => 'Home, Work office, other',
     'Placeholder address1' => '76 Ninth Avenue',
     'Placeholder address2' => 'Address',
diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php
index e96407fea..410d328b4 100755
--- a/templates/default/I18n/es_ES.php
+++ b/templates/default/I18n/es_ES.php
@@ -44,7 +44,7 @@ return array(
     'Date' => '',
     'Delete address' => '',
     'Delivery address' => '',
-    'Delivery Informations' => '',
+    'Delivery Information' => '',
     'Demo product description' => '',
     'Demo product title' => '',
     'Description' => '',
@@ -105,7 +105,7 @@ return array(
     'Password Forgotten' => '',
     'Password' => '',
     'per page' => '',
-    'Personal Informations' => '',
+    'Personal Information' => '',
     'Placeholder address label' => '',
     'Placeholder address1' => '',
     'Placeholder address2' => '',
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index 82a4581c4..5137cfcdd 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -44,7 +44,7 @@ return array(
     'Date' => 'Date',
     'Delete address' => 'Supprimer cette adresse',
     'Delivery address' => 'Adresse de livraison',
-    'Delivery Informations' => 'Informations de livraison',
+    'Delivery Information' => 'Informations de livraison',
     'Demo product description' => 'Example de description de produit',
     'Demo product title' => 'Example de titre',
     'Description' => 'Description',
@@ -108,7 +108,6 @@ return array(
     'Password' => 'Mot de passe',
     'per page' => 'par page',
     'Personal Information' => 'Informations personnelles',
-    'Personal Informations' => 'Informations personnelles',
     'Placeholder address label' => 'Maison, Domicile, Travail...',
     'Placeholder address1' => 'Adresse',
     'Placeholder address2' => '',
diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php
index e96407fea..410d328b4 100755
--- a/templates/default/I18n/it_IT.php
+++ b/templates/default/I18n/it_IT.php
@@ -44,7 +44,7 @@ return array(
     'Date' => '',
     'Delete address' => '',
     'Delivery address' => '',
-    'Delivery Informations' => '',
+    'Delivery Information' => '',
     'Demo product description' => '',
     'Demo product title' => '',
     'Description' => '',
@@ -105,7 +105,7 @@ return array(
     'Password Forgotten' => '',
     'Password' => '',
     'per page' => '',
-    'Personal Informations' => '',
+    'Personal Information' => '',
     'Placeholder address label' => '',
     'Placeholder address1' => '',
     'Placeholder address2' => '',
diff --git a/templates/default/account-update.html b/templates/default/account-update.html
index d4ba0fadb..467d586f6 100644
--- a/templates/default/account-update.html
+++ b/templates/default/account-update.html
@@ -35,7 +35,7 @@
 
                 <fieldset id="register-info" class="panel">
                     <div class="panel-heading">
-                        {intl l="Personal Informations"}
+                        {intl l="Personal Information"}
                     </div>
 
                     <div class="panel-body">
diff --git a/templates/default/account.html b/templates/default/account.html
index 9904760f9..b5453d673 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -26,7 +26,7 @@
                     <div class="panel-heading">
                         <h4 class="panel-title">
                             <a class="accordion-toggle" data-toggle="collapse" data-parent="#account" href="#account-info">
-                                {intl l="Personal Informations"}
+                                {intl l="Personal Information"}
                             </a>
                         </h4>
                     </div>
diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js
index c9ecf99ab..c96d25ca1 100644
--- a/templates/default/assets/js/script.js
+++ b/templates/default/assets/js/script.js
@@ -229,7 +229,7 @@
 
             var $btnAddToCart   = $(".btn_add_to_cart", $("#form-product-details"));
 
-            var $productMeta    = $("#stockInformations");
+            var $productMeta    = $("#stock-information");
 
             var $inStock        = $(".in",$productMeta);
             var $outOfStock     = $(".out",$productMeta);
diff --git a/templates/default/assets/less/thelia/buttons.less b/templates/default/assets/less/thelia/buttons.less
index 6f328162c..4f5bc91fb 100644
--- a/templates/default/assets/less/thelia/buttons.less
+++ b/templates/default/assets/less/thelia/buttons.less
@@ -43,6 +43,7 @@
 
     // Keep old style button
     &.btn-add-address,
+    &.btn-cart-update,
     &.btn-coupon,
     &.btn-filter,
     &.btn-grid,
diff --git a/templates/default/assets/less/thelia/cart.less b/templates/default/assets/less/thelia/cart.less
index 5f8c2dfb1..c56b52255 100644
--- a/templates/default/assets/less/thelia/cart.less
+++ b/templates/default/assets/less/thelia/cart.less
@@ -96,4 +96,10 @@
     display: block;
     font-size: 2.2em;
   }
+}
+
+// Qty (js enabled)
+.js .group-qty {
+  .form-inline .form-group { display: block; }
+  .btn-cart-update { .sr-only; }
 }
\ No newline at end of file
diff --git a/templates/default/assets/less/thelia/product.less b/templates/default/assets/less/thelia/product.less
index 44965ed2a..b62a1a10b 100755
--- a/templates/default/assets/less/thelia/product.less
+++ b/templates/default/assets/less/thelia/product.less
@@ -31,7 +31,7 @@
       text-transform: uppercase;
     }
 
-    #stockInformations{
+    #stock-information {
 
     }
 }
diff --git a/templates/default/assets/less/thelia/toolbars.less b/templates/default/assets/less/thelia/toolbars.less
index a68221f8e..11512bac8 100755
--- a/templates/default/assets/less/thelia/toolbars.less
+++ b/templates/default/assets/less/thelia/toolbars.less
@@ -41,3 +41,8 @@
          > .pagination { margin: 15px 0 0; }
     }
 }
+
+.no-js .toolbar {
+  .limiter,
+  .sort-by { display : none; }
+}
diff --git a/templates/default/cart.html b/templates/default/cart.html
index 22d0af420..fbee326e3 100644
--- a/templates/default/cart.html
+++ b/templates/default/cart.html
@@ -98,13 +98,16 @@
                         </td>
                         <td class="qty">
                             <div class="form-group group-qty">
-                                <form action="{url path="/cart/update"}" method="post">
+                                <form action="{url path="/cart/update"}" class="form-inline" method="post">
                                     <input type="hidden" name="cart_item" value="{$ITEM_ID}">
-                                    <select name="quantity" class="form-control" onchange="jQuery(this).parent('form').submit();">
-                                        {for $will=1 to $STOCK}
-                                            <option {if $QUANTITY == $will}selected="selected"{/if}>{$will}</option>
-                                        {/for}
-                                    </select>
+                                    <div class="form-group">
+                                        <select name="quantity" class="form-control" onchange="jQuery(this).parent('form').submit();">
+                                            {for $will=1 to $STOCK}
+                                                <option {if $QUANTITY == $will}selected="selected"{/if}>{$will}</option>
+                                            {/for}
+                                        </select>
+                                    </div>
+                                    <button type="submit" title="{intl l="Update Quantity"}" class="btn btn-cart-update">{intl l="+"}</button>
                                 </form>
                             </div>
                         </td>
diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html
index 9b23cc748..78bf56667 100644
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -162,7 +162,7 @@
                 </form>
             {/form}
             {form name="thelia.order.payment"}
-
+            {assign var="isPost" value="{$smarty.post|count}"}
             <form id="form-cart-payment" action="{url path="/order/invoice"}" method="post" {form_enctype form=$form}>
 
                 {form_hidden_fields form=$form}
@@ -191,7 +191,6 @@
                     </div>
 
                     {form_field form=$form field='invoice-address'}
-
                     <div class="panel">
                         <div class="panel-heading">{intl l="Billing address"}s</div>
 
@@ -201,65 +200,19 @@
 
                         <div class="panel-body">
 
-                            <table class="col-md-12">
-
-                        {if !$error && $value}
-                            {assign defaultParam '*'}
-                        {else}
-                            {assign defaultParam 'true'}
-                        {/if}
-                        {if !$error && $value}
-                            {assign idParam $value}
-                        {else}
-                            {assign idParam '*'}
-                        {/if}
-                        {loop type="address" name="invoice-address" default=$defaultParam id=$idParam}
-
-                            <tr>
-                                <td>
-                                    <span class="fn">{loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords}</span>
-                                    <span class="org">{$COMPANY}</span>
-                                    <address class="adr">
-                                        <span class="street-address">{$ADDRESS1}</span><br>
-                                        {if $ADDRESS2 != ""}
-                                            <span class="street-address">{$ADDRESS2}</span><br>
-                                        {/if}
-                                        {if $ADDRESS3 != ""}
-                                            <span class="street-address">{$ADDRESS3}</span><br>
-                                        {/if}
-                                        <span class="postal-code">{$ZIPCODE}</span>
-                                        <span class="locality">{$CITY}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
-                                    </address>
-                                </td>
-                                <td>
-                                    <input class="js-invoice-address-selector {if !$error}hidden{/if}" type="radio" name="{$name}" value="{$ID}" {if $value == $ID OR !$error}checked="checked"{/if}>
-                                </td>
-                            </tr>
-
-                            {if !$error}
-                            <tr class="js-change-invoice-address">
-                                <td colspan="2">
-                                    <a href="#" class="btn btn-change-address">{intl l="Change address"}</a>
-                                </td>
-                            </tr>
+                        {loop type="address" name="invoice-address"}
+                            {assign var="isInvoiceAddressChecked" value="0"}
+                            {if $isPost}
+                                {if $value == $ID}
+                                    {assign var="isInvoiceAddressChecked" value="1"}
+                                {/if}
+                            {elseif $DEFAULT}
+                                {assign var="isInvoiceAddressChecked" value="1"}
                             {/if}
 
-                        {/loop}
-
-                        {if !$error && $value}
-                            {assign defaultParam '*'}
-                        {else}
-                            {assign defaultParam 'false'}
-                        {/if}
-                        {if !$error && $value}
-                            {assign excludeParam $value}
-                        {else}
-                            {assign excludeParam 'none'}
-                        {/if}
-                        {loop type="address" name="invoice-address" default=$defaultParam exclude=$excludeParam}
-
-                            <tr class="js-other-invoice-address {if !$error}hidden{/if}">
-                                <td>
+                            <div class="radio">
+                                <label for="invoice-address_{$ID}">
+                                    <input type="radio" name="{$name}" id="invoice-address_{$ID}" value="{$ID}"{if $isInvoiceAddressChecked} checked="checked"{/if}>
                                     <span class="fn">{loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords}</span>
                                     <span class="org">{$COMPANY}</span>
                                     <address class="adr">
@@ -273,15 +226,11 @@
                                         <span class="postal-code">{$ZIPCODE}</span>
                                         <span class="locality">{$CITY}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
                                     </address>
-                                </td>
-                                <td>
-                                    <input class="js-invoice-address-selector {if !$error}hidden{/if}" type="radio" name="{$name}" value="{$ID}" {if $value == $ID}checked="checked"{/if}>
-                                </td>
-                            </tr>
-
+                                </label>
+                            </div>
                         {/loop}
 
-                            </table>
+                            <a href="#" class="btn btn-change-address hidden">{intl l="Change address"}</a>
 
                         </div>
 
@@ -342,15 +291,21 @@
 
 {block name="javascript-initialization"}
 <script type="text/javascript">
-jQuery(function($order) {
-    $order('.js-change-invoice-address').on('click', 'a', function(e) {
-        e.preventDefault();
+jQuery(function($) {
+    $('#cart-address').each(function(){
+        var $radio = $('.radio', this),
+            $btn = $('.btn-change-address');
 
-        $order('.js-other-invoice-address').removeClass('hidden');
-        $order('.js-invoice-address-selector').removeClass('hidden');
+        // Hide other invoice address
+        $radio.filter( function(){ return !$(this).find(':radio').is(':checked'); }).hide();
+        $btn
+            .removeClass('hidden')
+            .bind('click.btn-change-address', function(){
+                $radio.show();
+                $(this).hide();
 
-        $order('#js-invoice-address-default-selector').unbind().remove();
-        $order('.js-change-invoice-address').unbind().remove();
+                return false;
+            });
     });
 });
 </script>
diff --git a/templates/default/product.html b/templates/default/product.html
index abce5751e..097d40a4b 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -113,7 +113,7 @@
                 <div class="product-price" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
                     <div class="availability">
                         <span class="availibity-label">{intl l="Availability"}: </span>
-                        <span itemprop="availability" href="{$current_stock_href}" class="{$current_stock_class}" id="stockInformations">
+                        <span itemprop="availability" href="{$current_stock_href}" class="{$current_stock_class}" id="stock-information">
                             <span class="in">{intl l='In Stock'}</span><span class="out">{intl l='Out of Stock'}</span>
                         </span>
                     </div>
diff --git a/templates/default/register.html b/templates/default/register.html
index 29d5879de..73d7f5f20 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -27,7 +27,7 @@
                 {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
                 <fieldset id="register-info" class="panel">
                     <div class="panel-heading">
-                        1. {intl l="Personal Informations"}
+                        1. {intl l="Personal Information"}
                     </div>
 
                     <div class="panel-body">
@@ -116,7 +116,7 @@
 
                 <fieldset id="register-delivery" class="panel">
                     <div class="panel-heading">
-                        2. {intl l="Delivery Informations"}
+                        2. {intl l="Delivery Information"}
                     </div>
 
                     <div class="panel-body">