diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index 981e8130f..cf7797cc9 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -95,6 +95,11 @@
     <!-- end customer address routes -->
 
     <!-- cart routes -->
+    <route id="cart.view" path="/cart">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">cart</default>
+    </route>
+
     <route id="cart.add.process" path="/cart/add">
         <default key="_controller">Thelia\Controller\Front\CartController::addItem</default>
     </route>
diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php
index 54ac1d703..5892194a4 100755
--- a/core/lib/Thelia/Controller/Front/BaseFrontController.php
+++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php
@@ -64,7 +64,7 @@ class BaseFrontController extends BaseController
     {
         $cart = $this->getSession()->getCart();
         if ($cart===null || $cart->countCartItems() == 0) {
-            $this->redirectToRoute('default', array('view'=>'cart'));
+            $this->redirectToRoute('cart.view');
         }
     }
 
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index a51fb98bc..23f2e0f30 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -109,7 +109,7 @@ class CustomerController extends BaseFrontController
 
                 $cart = $this->getCart($this->getRequest());
                 if ($cart->getCartItems()->count() > 0) {
-                    $this->redirectToRoute('default', array('view'=>'cart'));
+                    $this->redirectToRoute('cart.view');
                 } else {
                     $this->redirectSuccess($customerCreation);
                 }
diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php
index 21aa22f4f..bb0604bd1 100755
--- a/core/lib/Thelia/Controller/Front/OrderController.php
+++ b/core/lib/Thelia/Controller/Front/OrderController.php
@@ -197,7 +197,7 @@ class OrderController extends BaseFrontController
             $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute('order.placed', array('order_id' => $orderEvent->getPlacedOrder()->getId()))));
         } else {
             /* order has not been placed */
-            $this->redirectToRoute('default', array('view'=>'cart'));
+            $this->redirectToRoute('cart.view');
         }
     }
 
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
index 6fea48aea..71c6b8695 100644
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -29,7 +29,7 @@
                             <div class="form-container">
                                 <div class="col-md-12">
 
-        						    {form name="thelia.admin.customer.modification"}
+        						    {form name="thelia.admin.customer.update"}
         						    	<form method="POST" action="{url path="/admin/customer/update/{$ID}"}" {form_enctype form=$form} class="clearfix">
 
                                             <div class="row inner-toolbar clearfix">
diff --git a/templates/default/account.html b/templates/default/account.html
index 50d37e7d3..100080768 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -58,7 +58,7 @@
                                     <span class="email">{mailto address="{$EMAIL}" encode="hex"}</span>
                                 </li>
                                 <li class="group-btn">
-                                    <a href="{url path="/account/update"}" class="btn btn-change-account"><i class="icon-pencil"></i> {intl l="Change my account informations"}</a>
+                                    <a href="{url path="/account/update"}" class="btn btn-change-account"><i class="icon-pencil"></i> {intl l="Change my account information"}</a>
                                     <a href="{url path="/account/password"}" class="btn btn-change-password"><i class="icon-lock"></i> {intl l="Change my password"}</a>
                                 </li>
                             </ul>
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 37d275aa9..6933dbb26 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -222,22 +222,29 @@ URL: http://www.thelia.net
                 </div>
                 <div class="col">
                     <section class="block block-default">
-                        <div class="block-heading"><h3 class="block-title">Usefull links</h3></div>
+                        <div class="block-heading"><h3 class="block-title">{intl l="Usefull links"}</h3></div>
                         <div class="block-content">
                             <ul>
                                 {loop name="footer_links" type="content" folder="2"}
                                     <li><a href="{$URL}">{$TITLE}</a></li>
                                 {/loop}
-                                <li><a href="{url path="/login"}">Login</a></li>
-                                <li><a href="{url path="/register"}">Register</a></li>
-                                <li><a href="{url path="/order/delivery"}">Checkout</a></li>
+                                {loop type="auth" name="customer_is_logged" role="CUSTOMER" context="front"}
+                                    <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
+                                    <li><a href="{url path="/account"}" class="account">{intl l="My Account"}</a></li>
+                                {/loop}
+                                {elseloop rel="customer_is_logged"}
+                                <li><a href="{url path="/login"}">{intl l="Login"}</a></li>
+                                <li><a href="{url path="/register"}">{intl l="Register"}</a></li>
+                                {/elseloop}
+                                <li><a href="{url path="/Cart"}">{intl l="Cart"}</a></li>
+                                <li><a href="{url path="/order/delivery"}">{intl l="Checkout"}</a></li>
                             </ul>
                         </div>
                     </section>
                 </div>
                 <div class="col">
                     <section class="block block-social">
-                        <div class="block-heading"><h3 class="block-title">Follow us</h3></div>
+                        <div class="block-heading"><h3 class="block-title">{intl l="Follow us"}</h3></div>
                         <div class="block-content">
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
                             <ul role="presentation">
@@ -315,7 +322,7 @@ URL: http://www.thelia.net
 
                 <div class="col">
                     <section class="block block-contact" itemscope itemtype="http://schema.org/Organization">
-                        <div class="block-heading"><h3 class="block-title">Contact Us</h3></div>
+                        <div class="block-heading"><h3 class="block-title">{intl l="Contact Us"}</h3></div>
                         <div class="block-content">
                             <meta itemprop="name" content="{config key="company_name"}">
                             <ul>
@@ -351,7 +358,7 @@ URL: http://www.thelia.net
                         {/loop}
                         {*<li><a href="#">Site Map</a></li>
                         <li><a href="#">Terms & Conditions</a></li>*}
-                        <li><a href="{url path="/contact"}">Contact Us</a></li>
+                        <li><a href="{url path="/contact"}">{intl l="Contact Us"}</a></li>
                     </ul>
                 </nav>