diff --git a/templates/default/assets/less/thelia/cart.less b/templates/default/assets/less/thelia/cart.less
index 58f32a4c9..5f8c2dfb1 100644
--- a/templates/default/assets/less/thelia/cart.less
+++ b/templates/default/assets/less/thelia/cart.less
@@ -48,7 +48,11 @@
                     }
                 }
             }
-            &.qty {}
+            &.qty {
+                .group-qty {
+                    margin-bottom: 0;
+                }
+            }
             &.subprice {
                 .price {
                     color: @brand-primary;
diff --git a/templates/default/assets/less/thelia/global.less b/templates/default/assets/less/thelia/global.less
index 1430bdaa4..378af265c 100755
--- a/templates/default/assets/less/thelia/global.less
+++ b/templates/default/assets/less/thelia/global.less
@@ -33,12 +33,12 @@
 
 // thumbnail
 .thumbnail {
-    &.active,
+    /*&.active,
     &:active {
         border-style: solid;
         border-width: 2px;
-    }
-    &.active { border-color: @gray-light; }
+    }*/
+    &.active { border-color: @gray-dark; }
 }
 
 // Layout
diff --git a/templates/default/assets/themes/default/less/theme.less b/templates/default/assets/themes/default/less/theme.less
index f3cd5fb99..f07461c56 100755
--- a/templates/default/assets/themes/default/less/theme.less
+++ b/templates/default/assets/themes/default/less/theme.less
@@ -1120,6 +1120,21 @@ td.product,
     }
 }
 
+.table-cart-mini {
+
+  thead,
+  tbody,
+  tfoot {
+    > tr {
+      > th,
+      > td {
+        vertical-align: middle;
+      }
+    }
+  }
+}
+
+
 .table-cart {
 
     thead,
@@ -1130,6 +1145,7 @@ td.product,
             > td {
                 padding: 14px;
                 text-align: center;
+                vertical-align: middle;
                 &.product { text-align: left; }
             }
         }
diff --git a/templates/default/includes/mini-cart.html b/templates/default/includes/mini-cart.html
index 739302620..b91f73d83 100644
--- a/templates/default/includes/mini-cart.html
+++ b/templates/default/includes/mini-cart.html
@@ -45,7 +45,8 @@
                     <tr>
                         <td colspan="2" class="empty">
                             <a href="{url path="/cart"}" role="button" class="btn btn-default btn-sm"><span>{intl l="View Cart"}</span></a>
-                            <button type="submit" name="checkout" class="btn btn-warning btn-sm"><span>{intl l="Checkout"}</span></button>
+                            <a href="{url path="/order/delivery"}" role="button" class="btn btn-warning btn-sm"><span>{intl l="Checkout"}</span></a>
+                            {*<button type="submit" name="checkout" class="btn btn-warning btn-sm"><span>{intl l="Checkout"}</span></button>*}
                         </td>
                         <td class="total">
                             <div class="total-price">
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index c23e522a6..1fe7e913d 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -23,7 +23,7 @@ URL: http://www.thelia.net
     <meta charset="utf-8">
 
     {* Page Title *}
-    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} | {/foreach}{/if}{config key="company_name"}{/strip}{/block}</title>
+    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{config key="company_name"}{/strip}{/block}</title>
 
     {* Meta Tags *}
     <meta name="description" content="">
@@ -179,15 +179,15 @@ URL: http://www.thelia.net
             <div class="banner banner-col-3">
                 <div class="col">
                     <span class="icon-truck icon-flip-horizontal"></span>
-                    Free shipping <small>Orders over $50</small>
+                    {intl l="Free shipping"} <small>{intl l="Orders over $50"}</small>
                 </div>
                 <div class="col">
                     <span class="icon-credit-card"></span>
-                    Secure payment <small>Multi-payment plateform</small>
+                    {intl l="Secure payment"} <small>{intl l="Multi-payment plateform"}</small>
                 </div>
                 <div class="col">
                     <span class="icon-info"></span>
-                    Need help ? <small>Questions ? See or F.A.Q.</small>
+                    {intl l="Need help ?"} <small>{intl l="Questions ? See or F.A.Q."}</small>
                 </div>
             </div>
         </div>
@@ -198,7 +198,7 @@ URL: http://www.thelia.net
             <div class="blocks block-col-4">
                 <div class="col">
                     <section class="block block-links">
-                        <div class="block-heading"><h3 class="block-title">Latest articles</h3></div>
+                        <div class="block-heading"><h3 class="block-title">{intl l="Latest articles"}</h3></div>
                         <div class="block-content">
                             {ifloop rel="blog.articles"}
                                 <ul>
@@ -328,16 +328,16 @@ URL: http://www.thelia.net
                             <ul>
                                 <li class="contact-address">
                                     <address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
-                                        <span class="street-address" itemprop="streetAddress">street name of my business</span><br>
+                                        <span class="street-address" itemprop="streetAddress">Street name of my business</span><br>
                                         <span class="postal-code" itemprop="postalCode">75000</span>
-                                        <span class="locality" itemprop="addressLocality">City, <span class="country-name">Country</span></span>
+                                        <span class="locality" itemprop="addressLocality">City, <span class="country-name">France</span></span>
                                     </address>
                                 </li>
                                 <li class="contact-phone">
-                                    <span class="tel" itemprop="telephone">+33 04 44 05 31 00</span>
+                                    <span class="tel" itemprop="telephone">+33 (0)0 00 00 00 00</span>
                                 </li>
                                 <li class="contact-email">
-                                    {mailto address="info@thelia.net" encode="hex" extra='class="email" itemprop="email"'}
+                                    {mailto address="contact@yourdomain.com" encode="hex" extra='class="email" itemprop="email"'}
                                 </li>
                             </ul>
                         </div>
@@ -362,7 +362,7 @@ URL: http://www.thelia.net
                     </ul>
                 </nav>
 
-                <section class="copyright">Copyright &copy; <time datetime="2013-08-01">2013</time> <a href="http://www.thelia.net" rel="external">Thelia</a></section>
+                <section class="copyright">{intl l="Copyright"} &copy; <time datetime="{'Y-m-d'|date}">{'Y'|date}</time> <a href="http://www.thelia.net" rel="external">Thelia</a></section>
             </div>
         </div>
     </footer><!-- /.footer-info -->
diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html
index baf4cf9a7..fc2110e06 100644
--- a/templates/default/order-delivery.html
+++ b/templates/default/order-delivery.html
@@ -31,6 +31,7 @@
             </div>
 
             {form name="thelia.order.delivery"}
+            {assign var="isPost" value="{$smarty.post|count}"}
             <form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}>
 
                 {form_hidden_fields form=$form}
@@ -42,7 +43,7 @@
                 <div id="delivery-address" class="panel">
                     <div class="panel-heading clearfix">
                         <a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a>
-                        {intl l="Chose your delivery address"}
+                        {intl l="Choose your delivery address"}
                         {if $error}
                             <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                         {/if}
@@ -50,18 +51,20 @@
                     <div class="panel-body">
                         <table class="table table-address" role="presentation" summary="Address Books">
                             <tbody>
-
                             {loop type="address" name="customer.addresses" customer="current"}
-
-
+                            {if $isPost}
+                                {if $value == $ID}
+                                    {assign var="isDeliveryAddressChecked" value="true"}
+                                {/if}
+                            {elseif $DEFAULT}
+                                {assign var="isDeliveryAddressChecked" value="true"}
+                            {/if}
                             <tr>
                                 <th>
                                     <div class="radio">
                                         <label for="delivery-address_{$ID}">
-
-                                                <input type="radio" name="{$name}" value="{$ID}" {if $value == $ID}checked="checked"{/if} id="delivery-address_{$ID}">
-
-                                            {$LABEL}
+                                            <input type="radio" name="{$name}" value="{$ID}"{if isDeliveryAddressChecked } checked="checked"{/if} id="delivery-address_{$ID}">
+                                            {$LABEL|default:"{intl l='Address %nb' nb={$LOOP_COUNT}}"}
                                         </label>
                                     </div>
                                 </th>
@@ -125,12 +128,19 @@
                     <div class="panel-body">
                         {loop type="delivery" name="deliveries" force_return="true"}
                         <div class="radio">
-                            <label for="delivery-method_1">
-                                {form_field form=$form field='delivery-module'}
-                                    <input type="radio" name="{$name}" {if $value == $ID}checked="checked"{/if} value="{$ID}">
-                                {/form_field}
-                                <strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE}
-                            </label>
+                            {form_field form=$form field='delivery-module'}
+                                {if $isPost}
+                                    {if $value == $ID}
+                                        {assign var="isDeliveryMethodChecked" value="true"}
+                                    {/if}
+                                {elseif $LOOP_COUNT == 1}
+                                    {assign var="isDeliveryMethodChecked" value="true"}
+                                {/if}
+                                <label for="delivery-method_{$ID}">
+                                    <input type="radio" name="{$name}" id="delivery-method_{$ID}"{if $isDeliveryMethodChecked} checked="checked"{/if} value="{$ID}">
+                                    <strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE}
+                                </label>
+                            {/form_field}
                         </div>
                         {/loop}
                     </div>
diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html
index 54334647b..374a63e62 100644
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -70,7 +70,6 @@
                     <tbody>
 
                     {loop type="cart" name="cartloop"}
-
                     <tr>
                         <td class="image">
 
@@ -141,7 +140,7 @@
                         <td class="coupon">
                             {form_field form=$form field='coupon-code'}
                                 <div class="input-group {if $error}has-error{/if}">
-                                    <label class="control-label" for="code">{intl l='Code :'}</label>
+                                    <label class="control-label sr-only" for="code">{intl l='Code :'}</label>
                                     <input id="coupon" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="{intl l='Coupon code'}">
                                     <span class="input-group-btn">
                                         <button type="submit" class="btn btn-coupon">{intl l="Ok"}</button>