diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 43e48f6e4..876814d5d 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -18,7 +18,7 @@
         <loop class="Thelia\Core\Template\Loop\Currency" name="currency"/>
         <loop class="Thelia\Core\Template\Loop\Customer" name="customer"/>
         <loop class="Thelia\Core\Template\Loop\Feature" name="feature"/>
-        <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature_availability"/>
+        <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature-availability"/>
         <loop class="Thelia\Core\Template\Loop\FeatureValue" name="feature_value"/>
         <loop class="Thelia\Core\Template\Loop\Folder" name="folder"/>
         <loop class="Thelia\Core\Template\Loop\Order" name="order"/>
@@ -102,6 +102,8 @@
         <form name="thelia.admin.country.creation" class="Thelia\Form\CountryCreationForm"/>
         <form name="thelia.admin.country.modification" class="Thelia\Form\CountryModificationForm"/>
 
+        <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
+
     </forms>
 
 
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index a34cbdca6..4d176d2fc 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -184,6 +184,12 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction</default>
     </route>
 
+    <!--Features and attributes -->
+
+    <route id="admin.products.update-attributes-and-features" path="/admin/product/{productId}/update-attributes-and-features">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::updateAttributesAndFeaturesAction</default>
+    </route>
+
 
     <!--  Folder routes management -->
     <route id="admin.folders.default" path="/admin/folders">
diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index bd1c32de2..7a0bac76d 100755
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -206,7 +206,8 @@ class Category extends BaseI18nLoop
                 ->set("POSTSCRIPTUM", $category->getVirtualColumn('i18n_POSTSCRIPTUM'))
                 ->set("PARENT", $category->getParent())
                 ->set("URL", $category->getUrl($locale))
-                ->set("PRODUCT_COUNT", $category->countChild())
+                ->set("PRODUCT_COUNT", $category->countAllProducts())
+                ->set("CHILD_COUNT", $category->countChild())
                 ->set("VISIBLE", $category->getVisible() ? "1" : "0")
                 ->set("POSITION", $category->getPosition())
 
diff --git a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
index 712767954..009e2204f 100755
--- a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
+++ b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
@@ -59,7 +59,7 @@ class CategoryTree extends BaseI18nLoop
     }
 
     // changement de rubrique
-    protected function buildCategoryTree($parent, $visible, $level, $max_level, $exclude, LoopResult &$loopResult)
+    protected function buildCategoryTree($parent, $visible, $level, $previousLevel, $max_level, $exclude, LoopResult &$loopResult)
     {
         if ($level > $max_level) return;
 
@@ -87,11 +87,12 @@ class CategoryTree extends BaseI18nLoop
                 ->set("ID", $result->getId())->set("TITLE", $result->getVirtualColumn('i18n_TITLE'))
                 ->set("PARENT", $result->getParent())->set("URL", $result->getUrl($locale))
                 ->set("VISIBLE", $result->getVisible() ? "1" : "0")->set("LEVEL", $level)
+                ->set('CHILD_COUNT', $result->countChild())->set('PREV_LEVEL', $previousLevel)
             ;
 
             $loopResult->addRow($loopResultRow);
 
-            $this->buildCategoryTree($result->getId(), $visible, 1 + $level, $max_level, $exclude, $loopResult);
+            $this->buildCategoryTree($result->getId(), $visible, 1 + $level, $level, $max_level, $exclude, $loopResult);
         }
     }
 
@@ -109,7 +110,7 @@ class CategoryTree extends BaseI18nLoop
 
         $loopResult = new LoopResult();
 
-        $this->buildCategoryTree($id, $visible, 0, $depth, $exclude, $loopResult);
+        $this->buildCategoryTree($id, $visible, 0, 0, $depth, $exclude, $loopResult);
 
         return $loopResult;
     }
diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php
index cfd54db4f..5c56dff94 100755
--- a/core/lib/Thelia/Core/Template/Loop/Folder.php
+++ b/core/lib/Thelia/Core/Template/Loop/Folder.php
@@ -162,7 +162,8 @@ class Folder extends BaseI18nLoop
                 ->set("POSTSCRIPTUM", $folder->getVirtualColumn('i18n_POSTSCRIPTUM'))
                 ->set("PARENT", $folder->getParent())
                 ->set("URL", $folder->getUrl($locale))
-                ->set("CONTENT_COUNT", $folder->countChild())
+                ->set("CHILD_COUNT", $folder->countChild())
+                ->set("CONTENT_COUNT", $folder->countAllContents())
                 ->set("VISIBLE", $folder->getVisible() ? "1" : "0")
                 ->set("POSITION", $folder->getPosition())
             ;
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
index aa96a0014..f1249697a 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
@@ -186,7 +186,8 @@ class UrlGenerator extends AbstractSmartyPlugin
 
     protected function getCurrentUrl()
     {
-        return URL::getInstance()->retrieveCurrent($this->request)->toString();
+        //return URL::getInstance()->retrieveCurrent($this->request)->toString();
+        return $this->request->getUri();
     }
 
     protected function getReturnToUrl()
diff --git a/core/lib/Thelia/Form/ProfileModificationForm.php b/core/lib/Thelia/Form/ProfileModificationForm.php
new file mode 100644
index 000000000..e3119cfee
--- /dev/null
+++ b/core/lib/Thelia/Form/ProfileModificationForm.php
@@ -0,0 +1,119 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia                                                                       */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*      along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Form;
+
+use Symfony\Component\Validator\Constraints;
+use Thelia\Core\Translation\Translator;
+use Thelia\Model\ConfigQuery;
+
+/**
+ * Class ProfileModification
+ * @package Thelia\Form
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ProfileModificationForm extends BaseForm
+{
+
+
+    protected function buildForm()
+    {
+
+        $this->formBuilder
+            ->add("firstname", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("First Name"),
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
+            ))
+            ->add("lastname", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Last Name"),
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
+            ))
+            ->add("default_language", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Default language"),
+                "label_attr" => array(
+                    "for" => "default_language"
+                )
+            ))
+            ->add("editing_language_default", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Editing language default"),
+                "label_attr" => array(
+                    "for" => "editing_language_default"
+                )
+            ))
+            ->add("old_password", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
+                ),
+                "label" => Translator::getInstance()->trans("Old password"),
+                "label_attr" => array(
+                    "for" => "old_password"
+                )
+            ))
+            ->add("password", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
+                ),
+                "label" => Translator::getInstance()->trans("Password"),
+                "label_attr" => array(
+                    "for" => "password"
+                )
+            ))
+            ->add("password_confirm", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4))),
+                    new Constraints\Callback(array("methods" => array(
+                        array($this, "verifyPasswordField")
+                    )))
+                ),
+                "label" => "Password confirmation",
+                "label_attr" => array(
+                    "for" => "password_confirmation"
+                )
+            ))
+        ;
+    }
+
+    public function getName()
+    {
+        return "thelia_profile_modification";
+    }
+}
diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php
index 8cbe00ce0..128c5932a 100755
--- a/core/lib/Thelia/Model/Folder.php
+++ b/core/lib/Thelia/Model/Folder.php
@@ -44,8 +44,8 @@ class Folder extends BaseFolder
 
         foreach($children as $child)
         {
-            $contentsCount += ProductQuery::create()
-                ->filterByCategory($child)
+            $contentsCount += ContentQuery::create()
+                ->filterByFolder($child)
                 ->count();
         }
 
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index 19947efa6..0a8af40c8 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -44,8 +44,11 @@ trait UrlRewritingTrait {
      *
      * @param string $locale a valid locale (e.g. en_US)
      */
-    public function getUrl($locale)
+    public function getUrl($locale = null)
     {
+        if(null === $locale) {
+            $locale = $this->getLocale();
+        }
         return URL::getInstance()->retrieve($this->getRewrittenUrlViewName(), $this->getId(), $locale)->toString();
     }
 
diff --git a/install/import/products.csv b/install/import/products.csv
index d2d84fb53..b085feee2 100644
--- a/install/import/products.csv
+++ b/install/import/products.csv
@@ -18,7 +18,7 @@ Swivel feature for added function. ";"Zoe est un fauteuil contemporain qui combi
 "PROD013";"Violet";"A beautifull classic";"Une beauté classique";"A new edition of a classic. Beneath a beautiful colorfull leather, a strong walnut wood frame. You will appreciate the luxurious stylish details of the ''Violet'' armless chair. ";"La réédition d'un classique. Sous un superbe cuir aux couleurs chatoyantes, une solide structure en noyer. Vous apprécierez les détails stylistiques luxueux de notre chaise Violet. ";"Dimensions : Width : 19'' – Depth : 23'' – Height : 31''";"Dimensions : Larg. 50 cm – Prof.60 cm – Haut. 80 cm";98;;"PROD013-1.jpg";"MAGIS";"Gray";"Chairs"
 "PROD014";"Sally";"Contemporary atypical chair";"Chaise contemporaine hors normes";"Contemporary atypical chair. The atypical sitting of the ''Sally '' chair  will nestled you in confort. Play with the vibrant colours range to create a unique dining room. ";"Chaise contemporaine hors normes. L'assise surprenante de la chaise Sally vous enveloppera de confort. Amusez vous avec l'éventail de couleurs lumineuses pour créer une salle à manger unique. ";"Dimensions :  Width : 19'' – Depth : 23'' – Height : 31''";"Dimensions : Larg. 50 cm – Prof.60 cm – Haut. 80 cm";112;;"PROD014-1.jpg;PROD014-2.jpg;PROD014-3.jpg;PROD014-4.jpg";"PARRY";"blue;purple;orange;yellow";"Chairs"
 "PROD015";"Oliver";"Comfort & Design";"Confort et Design";"Surround yourself in ultra modern luxury with the ''Oliver'' armchair and get a look at the future ! Eye-catching, this unique combination of comfort and design is a must-have for today's book nook. ";"Abandonnez vous à un univers de luxe ultra moderne avec le fauteuil Oliver et voyagez dans le futur ! Cette combinaison unique de confort et de design est spectaculaire. Un élément incontournable pour votre bibliothèque. ";"Dimensions : Width : 30'' – Depth : 27'' – height : 31''";"Dimensions : Larg. 75 cm – Prof. 69 cm – Haut. 80 cm";340;;"PROD015-1.jpg;PROD015-2.jpg;";"MAGIS";"white;black";"Armchairs;Chairs"
-"PROD016";"Lexie";"A modern style";"Un style moderne";"Demonstrate your flair for modern style with our ''Lexie'' chair in your dining room. A rectangular cushioned back offers a contemporary feel, while the comfortable seat provides complete comfort. ";"Montrez que vous avez le sens de la modernité en choisissant  la chaise ''Lexie'' pour votre salle à manger. Le coussin rectangulaire sur le dossier apporte une touche contemporaine. L'assise généreuse apporte un confort complet. ";"Dimensions : Width : 19'' – Depth : 23'' – Height : 40''";"Dimensions : larg. 50 cm – Prof. 60 cm – Haut. 100 cm";159;;"PROD016-1.jpg";"PLINK";;"Chairs"
+"PROD016";"Lexie";"A modern style";"Un style moderne";"Demonstrate your flair for modern style with our ''Lexie'' chair in your dining room. A rectangular cushioned back offers a contemporary feel, while the comfortable seat provides complete comfort. ";"Montrez que vous avez le sens de la modernité en choisissant  la chaise ''Lexie'' pour votre salle à manger. Le coussin rectangulaire sur le dossier apporte une touche contemporaine. L'assise généreuse apporte un confort complet. ";"Dimensions : Width : 19'' – Depth : 23'' – Height : 40''";"Dimensions : larg. 50 cm – Prof. 60 cm – Haut. 100 cm";159;;"PROD016-1.jpg";"PLINK";"Beige";"Chairs"
 "PROD017";"Flynn";"A touch of retro vibe";"Un petit air rétro";"If your destination is up-to-date décor with a touch of retro vibe, look no further than our ''Flynn'' sofa. Sleek, low track arms and high tapering legs give this piece a mid-century flavor. The vibrant tones of the woven upholstery will easily blend with any interior décor. ";"Si vous recherchez une décoration actuelle avec une touche rétro, n'allez pas plus loin et opter pour notre canapé ''Flynn''. Ce canapé a un petit air des années 50 grâce à ses accoudoirs bas, ses pieds allongés et ses lignes pures. Les couleurs chatoyantes de son revêtement en laine lui permettent de se fondre dans tous les intérieurs. ";"Dimensions : Width : 89'' – Depth : 37'' – Height : 36''";"Dimensions : Larg. 225 cm – Prof. 95 cm – Haut. 90 cm";1299;;"PROD017-1.jpg;PROD017-2.jpg;PROD017-3.jpg;PROD017-4.jpg";"OFFUS";"blue;green;red;purple";"Sofas"
 "PROD018";"Emily";"A old-world feel";"Une touche d'histoire";"Our ''Emily''  armlesschair adds a touch of a old-world feel to your space. Perfect for when defining the seating space in a larger room. A medium wood finish sets off the delicate embellishments at the base, while the luxurous upholstery keeps the look fresh. The cushions guarantee that this is a chair worth relaxing in, not just admiring from afar. ";"La chaise ''Emily'' apporte une touche d'histoire à votre intérieur. Elle est parfaite pour structurer votre espace, notamment dans une grande pièce. Les finitions bois font la part belle à de délicates arabesques, tandis que le luxueux revêtement apporte un look frais. Cette chaise n'est pas destinée à la figuration grâce à la mousse confortable de l'assise. ";"Dimensions : Width : 33'' – Depth : 27'' – Height : 40''";"Dimensions : Larg. 85 cm – Prof. 69 cm – Haut. 100 cm";690;;"PROD018-1.jpg";"PARRY";"red";"Armchairs"
 "PROD019";"Edgar";"A special spot";"Un endroit à part";"A special spot for reading, lounging or chatting, our '' Edgar '' armchair has no reservations when it comes to style. The design starts with mid-century modern elements like lean arms, while the brushed stainless steel base ensures stability. Swivel feature for added function. ";"Un endroit spécial où lire, rêver ou discuter, notre fauteuil ''Edgar'' n'a pas de limite quand il s'agit de style. Son design part d'éléments contemporains comme ses accoudoirs bas et fins, tandis que sa base en inox brossé assure la stabilité de l'ensemble. Siège pivotant. ";"Dimensions : Width : 33'' – Depth : 27'' – Height : 40''";"Dimensions: Larg. 85 cm – Prof. 69 cm – Haut. 100 cm";275;;"PROD019-1.jpg;PROD019-2.jpg;PROD019-3.jpg;PROD019-4.jpg;PROD019-5.jpg";"TOKO";"blue;yellow;orange;pink;purple";"Armchairs"
diff --git a/templates/admin/default/assets/less/thelia/tables.less b/templates/admin/default/assets/less/thelia/tables.less
index 8a4baa897..e542786ec 100755
--- a/templates/admin/default/assets/less/thelia/tables.less
+++ b/templates/admin/default/assets/less/thelia/tables.less
@@ -1,3 +1,22 @@
+// Baseline styles
+
+.table {
+
+  // Cells
+  thead,
+  tbody,
+  tfoot {
+    > tr {
+      > th,
+      > td {
+        vertical-align: middle;
+      }
+    }
+  }
+  
+}
+
+
 tfoot{
 
 	.pagination{
diff --git a/templates/admin/default/home.html b/templates/admin/default/home.html
index ea1bd3392..3371a1d9f 100755
--- a/templates/admin/default/home.html
+++ b/templates/admin/default/home.html
@@ -21,8 +21,8 @@
 
 				<div class="text-center clearfix">
 					<div class="btn-group">
-						<button type="button" class="btn btn-default active" data-toggle="jqplot" data-target="turnover"><span class="glyphicon glyphicon-euro"></span> {intl l="Turnover"}</button>
-						<button type="button" class="btn btn-primary" data-toggle="jqplot" data-target="registration"><span class="glyphicon glyphicon-user"></span> {intl l="Registrations"}</button>
+						<button type="button" class="btn btn-default active" data-toggle="jqplot" data-target="sales"><span class="glyphicon glyphicon-euro"></span> {intl l="Sales"}</button>
+						<button type="button" class="btn btn-primary" data-toggle="jqplot" data-target="registration"><span class="glyphicon glyphicon-user"></span> {intl l="New customers"}</button>
 						<button type="button" class="btn btn-success" data-toggle="jqplot" data-target="orders"><span class="glyphicon glyphicon-shopping-cart"></span> {intl l="Orders"}</button>
 						<button type="button" class="btn btn-info" data-toggle="jqplot" data-target="first-orders"><span class="glyphicon glyphicon-thumbs-up"></span> {intl l="First orders"}</button>
 						<button type="button" class="btn btn-danger" data-toggle="jqplot" data-target="aborted-orders"><span class="glyphicon glyphicon-thumbs-down"></span> {intl l="Aborted orders"}</button>
@@ -34,7 +34,7 @@
 				<div class="jqplot-content">
 					<div id="jqplot"></div>
 
-					<div id="turnover" data-toggle="jqplot-serie" class="active"></div>
+					<div id="sales" data-toggle="jqplot-serie" class="active"></div>
 					<div id="registration" data-toggle="jqplot-serie"></div>
 					<div id="orders" data-toggle="jqplot-serie"></div>
 					<div id="first-orders" data-toggle="jqplot-serie"></div>
@@ -47,7 +47,7 @@
 	 		<div class="row">
 	 			<div class="col-md-4">
 					<div class="general-block-decorator">
-						<div class="title title-without-tabs">{intl l="Informations site"}</div>
+						<div class="title title-without-tabs">{intl l="Shop Informations"}</div>
 						<div class="table-responsive">
 							<table class="table table-striped">
 								<tbody>
@@ -56,7 +56,7 @@
 		                                <td>1</td>
 									</tr>
 									<tr>
-										<th>{intl l="Sections"}</th>
+										<th>{intl l="Categories"}</th>
 		                                <td>8</td>
 									</tr>
 									<tr>
@@ -64,11 +64,11 @@
 		                                <td>43</td>
 									</tr>
 									<tr>
-										<th>{intl l="Products online"}</th>
+										<th>{intl l="Online products"}</th>
 		                                <td>43</td>
 									</tr>
 									<tr>
-										<th>{intl l="Products offline"}</th>
+										<th>{intl l="Offline products"}</th>
 		                                <td>0</td>
 									</tr>
 									<tr>
@@ -76,11 +76,11 @@
 		                                <td>1</td>
 									</tr>
 									<tr>
-										<th>{intl l="Orders pending"}</th>
+										<th>{intl l="Pending orders"}</th>
 		                                <td>1</td>
 									</tr>
 									<tr>
-										<th>{intl l="Orders treatment"}</th>
+										<th>{intl l="In process orderst"}</th>
 		                                <td>0</td>
 									</tr>
 									<tr>
@@ -112,32 +112,32 @@
 								<div class="table-responsive">
 									<table class="table table-striped">
 		                                <tbody>
-		                                	<tr>
-		                                        <th>{intl l="C. A. TTC"}</th>
-		                                        <td>2000.00 €</td>
-		                                    </tr>
+                                            <tr>
+                                                <th>{intl l="Overall sales"}</th>
+                                                <td>2500.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Sales excluding shipping"}</th>
+                                                <td>2000.00 €</td>
+                                            </tr>
 		                                    <tr>
-		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-		                                        <td>2500.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC précédent"}</th>
+		                                        <th>{intl l="Yesterday sales"}</th>
 		                                        <td>1700.00 €</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Commandes en instance"}</th>
+		                                        <th>{intl l="Waiting orders"}</th>
 		                                        <td>4</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Commandes en traitement"}</th>
+		                                        <th>{intl l="In process orders"}</th>
 		                                        <td>52</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Commandes annulées"}</th>
+		                                        <th>{intl l="Canceled orders"}</th>
 		                                        <td>3</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Panier moyen TTC"}</th>
+		                                        <th>{intl l="Average cart"}</th>
 		                                        <td>25.00 €</td>
 		                                    </tr>
 		                           		</tbody>
@@ -148,34 +148,34 @@
 								<div class="table-responsive">
 		                            <table class="table table-striped">
 		                                <tbody>
-		                                	<tr>
-		                                        <th>{intl l="C. A. TTC"}</th>
-		                                        <td>2000.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-		                                        <td>2500.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC précédent"}</th>
-		                                        <td>1700.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en instance"}</th>
-		                                        <td>4</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en traitement"}</th>
-		                                        <td>52</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes annulées"}</th>
-		                                        <td>3</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Panier moyen TTC"}</th>
-		                                        <td>25.00 €</td>
-		                                    </tr>
+                                            <tr>
+                                                <th>{intl l="Overall sales"}</th>
+                                                <td>2500.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Sales excluding shipping"}</th>
+                                                <td>2000.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Previous month sales"}</th>
+                                                <td>1700.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Waiting orders"}</th>
+                                                <td>4</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="In process orders"}</th>
+                                                <td>52</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Canceled orders"}</th>
+                                                <td>3</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Average cart"}</th>
+                                                <td>25.00 €</td>
+                                            </tr>
 		                           		</tbody>
 		                        	</table>
 		                        </div>
@@ -184,34 +184,34 @@
 								<div class="table-responsive">
 		                            <table class="table table-striped">
 		                                <tbody>
-		                                	<tr>
-		                                        <th>{intl l="C. A. TTC"}</th>
-		                                        <td>2000.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-		                                        <td>2500.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC précédent"}</th>
-		                                        <td>1700.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en instance"}</th>
-		                                        <td>4</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en traitement"}</th>
-		                                        <td>52</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes annulées"}</th>
-		                                        <td>3</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Panier moyen TTC"}</th>
-		                                        <td>25.00 €</td>
-		                                    </tr>
+                                            <tr>
+                                                <th>{intl l="Overall sales"}</th>
+                                                <td>2500.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Sales excluding shipping"}</th>
+                                                <td>2000.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Previous year sales"}</th>
+                                                <td>1700.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Waiting orders"}</th>
+                                                <td>4</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="In process orders"}</th>
+                                                <td>52</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Canceled orders"}</th>
+                                                <td>3</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Average cart"}</th>
+                                                <td>25.00 €</td>
+                                            </tr>
 		                           		</tbody>
 		                            </table>
 		                        </div>
diff --git a/templates/admin/default/profile-edit.html b/templates/admin/default/profile-edit.html
index e69de29bb..e882dc40d 100644
--- a/templates/admin/default/profile-edit.html
+++ b/templates/admin/default/profile-edit.html
@@ -0,0 +1,126 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit profile'}{/block}
+
+{block name="check-permissions"}admin.profile.edit{/block}
+
+{block name="main-content"}
+    <div class="profile edit-profile">
+
+        <div id="wrapper" class="container">
+
+                <ul class="breadcrumb">
+        			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+                    <li>{intl l='Editing profile "%name"' name="{$NAME}"}</li>
+                </ul>
+
+        		<div class="row">
+        			<div class="col-md-12 general-block-decorator">
+
+    					<div class="col-md-12 title title-without-tabs">
+    					   {intl l="Edit profile $NAME"}
+    					</div>
+
+                        <div class="form-container">
+                            {form name="thelia.admin.profile.modification"}
+                                <form method="POST" action="{url path="/admin/profile/update/{$ID}"}" {form_enctype form=$form} class="clearfix">
+
+                                    {form_hidden_fields form=$form}
+
+                                    {form_field form=$form field='success_url'}
+                                        <input type="hidden" name="{$name}" value="{url path="/admin/profile/update/{$ID}"}" />
+                                    {/form_field}
+
+                                    {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                                    {form_field form=$form field='firstname'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$FIRSTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                                        </div>
+                                    {/form_field}
+
+                                    {form_field form=$form field='lastname'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                                        </div>
+                                    {/form_field}
+
+                                    {form_field form=$form field='default_language'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+
+                                            <select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker">
+                                                {loop type="lang" name="default_language" backend_context="1"}
+                                                    <option value="{$ID}" {if $ID == $TITLE}selected{/if}>{$TITLE}</option>
+                                                {/loop}
+                                            </select>
+                                        </div>
+                                    {/form_field}
+                                    
+                                    {form_field form=$form field='editing_language_default'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+
+                                            <select name="{$name}" id="{$label_attr.for}"  data-toggle="selectpicker">
+                                                {loop type="lang" name="editing_language_default" backend_context="1"}
+                                                    <option value="{$ID}" {if $ID == $TITLE}selected{/if}>{$TITLE}</option>
+                                                {/loop}
+                                            </select>
+                                        </div>
+                                    {/form_field}
+                                    
+                                    <div class="well">
+                                        <div class="title title-without-tabs">{intl l="Change password"}</div>
+
+                                        {form_field form=$form field='old_password'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Old password'}">
+                                            </div>
+                                        {/form_field}
+
+                                        {form_field form=$form field='password'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Password'}">
+                                            </div>
+                                        {/form_field}
+
+                                        {form_field form=$form field='password_confirm'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Password confirmation'}">
+                                            </div>
+                                        {/form_field}
+                                    </div>
+                                    
+                                    <div class="text-right">
+                                        <button type="submit" class="btn btn-default btn-primary" title="{intl l='Edit profile'}">
+                                            {intl l="Edit"}
+                                            <span class="glyphicon glyphicon-ok"></span>
+                                        </button>
+                                    </div>
+                                </form>
+                            {/form}
+    					</div>
+        				
+        			</div>
+
+        		</div>    		
+
+        </div>
+    </div>
+{/block}
+
+{block name="javascript-initialization"}
+
+    {javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
+{/block}
\ No newline at end of file
diff --git a/templates/default/account.html b/templates/default/account.html
index cffd5d754..187847ced 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -8,7 +8,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Account"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/address-update.html b/templates/default/address-update.html
index 51739d849..9e58e19ac 100644
--- a/templates/default/address-update.html
+++ b/templates/default/address-update.html
@@ -8,7 +8,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">{intl l="Account"}</span></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Address"}</span></li>
         </ul>
diff --git a/templates/default/address.html b/templates/default/address.html
index bf7793766..b400fe87b 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -8,8 +8,8 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">You are here: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Account</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/customer/account"}" itemprop="url"><span itemprop="title">Account</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Address"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js
index 18581ed1e..d115d2c5d 100644
--- a/templates/default/assets/js/script.js
+++ b/templates/default/assets/js/script.js
@@ -126,31 +126,14 @@
             }).filter(':has(:checked)').addClass('active');
         });
 
+        $('#limit-top').change(function(e){
+            window.location = $(this).val()
+        });
 
-        // Styliser le message Confirm par Bootstrap sur un formulaire
-        /*
-         $('body').on('click', '[data-confirm]', function(){
-         var $this = $(this);
-         bootbox.confirm($(this).attr('data-confirm'),
-         function(result){
-         if(result) {
-         // Si lien
-         if($this.attr('href')){
-         window.location.href = $this.attr('href');
-         }else{
-         // Si on doit soumettre un formulaire
-         var $form = $this.closest("form");
-         if($form.size() > 0){
-         $form.submit();
-         }
-         }
-         }
-         }
-         );
+        $('#sortby-top').change(function(e){
+            window.location = $(this).val()
+        });
 
-         return false;
-         });
-         */
     });
 
 })(jQuery);
diff --git a/templates/default/category.html b/templates/default/category.html
new file mode 100644
index 000000000..99db32948
--- /dev/null
+++ b/templates/default/category.html
@@ -0,0 +1,51 @@
+{extends file='layout.tpl'}
+
+{block name="breadcrumb"}
+    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
+        <strong id="breadcrumb-label">You are here: </strong>
+        <ul class="breadcrumb" itemprop="breadcrumb">
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            {loop name="category_path" type="category-path" category="{category attr="id"}"}
+            {if $ID == {category attr="id"}}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active">
+                    <span itemprop="title">{$TITLE}</span>
+                </li>
+            {else}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{$URL}"  itemprop="url"><span itemprop="title">{$TITLE}</span></a></li>
+            {/if}
+            {/loop}
+        </ul>
+    </nav><!-- /.nav-breadcrumb -->
+{/block}
+
+{block name="main-content"}
+    <div class="main layout-col-2-left">
+        {$limit={$smarty.get.limit|default:8}}
+        {$product_page={$smarty.get.page|default:1}}
+        {$product_order={$smarty.get.order|default:'alpha'}}
+        <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
+            {include file="includes/category-toolbar.html" toolbar="top" limit=$limit order=$product_order}
+            <div id="category-products">
+                <div class="products-content">
+                    <ul class="product-col-4">
+                        {loop type="product" name="product_list" category={category attr="id"} limit=$limit page=$product_page order=$product_order}
+                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="218" height="146"}
+                        {/loop}
+                    </ul>
+                </div>
+            </div><!-- /#category-products -->
+            {include file="includes/category-toolbar.html" toolbar="bottom"}
+        </article>
+
+        <aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
+
+            {include file="includes/menu.html"}
+
+            {include file="includes/categories-filters.html"}
+
+        </aside>
+
+    </div>
+
+    </div><!-- /.container -->
+{/block}
diff --git a/templates/default/includes/categories-filters.html b/templates/default/includes/categories-filters.html
new file mode 100644
index 000000000..6a9425a66
--- /dev/null
+++ b/templates/default/includes/categories-filters.html
@@ -0,0 +1,77 @@
+<section id="filters">
+    <h3>Find <span>a product</span></h3>
+    <form id="form-filters" action="" method="get" role="form">
+        <div class="filter filter-type">
+            <fieldset>
+                <legend class="filter-heading">Type</legend>
+                <div class="filter-content">
+                    <div class="checkbox">
+                        <label for="type0">
+                            <input type="checkbox" name="type0" id="type0" value="0"> Type 0
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="type1">
+                            <input type="checkbox" name="type1" id="type1" value="1"> Type 1
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="type2">
+                            <input type="checkbox" name="type2" id="type2" value="2"> Type 2
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- /Filter Type -->
+
+        <div class="filter filter-price">
+            <fieldset>
+                <legend class="filter-heading">Price</legend>
+                <div class="filter-content">
+                    <div class="checkbox">
+                        <label for="price0">
+                            <input type="checkbox" name="price0" id="price0" value="0"> $0.00 - $99.99
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="price1">
+                            <input type="checkbox" name="price1" id="price1" value="1"> $100.00 - $199.99
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="price2">
+                            <input type="checkbox" name="price2" id="price2" value="2"> $200.00 and above
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- /Filter Price -->
+
+        <div class="filter filter-size">
+            <fieldset>
+                <legend class="filter-heading">Size</legend>
+                <div class="filter-content">
+                    <div class="checkbox">
+                        <label for="size0">
+                            <input type="checkbox" name="size0" id="size0" value="0"> Large
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="size1">
+                            <input type="checkbox" name="size1" id="size1" value="1"> Medium
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="size2">
+                            <input type="checkbox" name="size2" id="size2" value="2"> Small
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- /Filter Size -->
+
+        <div class="group-btn">
+            <button type="submit" class="btn btn-filter">Submit</button>
+        </div>
+    </form>
+</section><!-- /.filters -->
\ No newline at end of file
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
new file mode 100644
index 000000000..99583a02d
--- /dev/null
+++ b/templates/default/includes/category-toolbar.html
@@ -0,0 +1,67 @@
+<div class="toolbar toolbar-{$toolbar}" role="toolbar">
+    {if $toolbar == "top" }
+    <div class="sorter-container">
+        <span class="amount">9 Item(s)</span>
+
+            <span class="limiter">
+                <label for="limit-top">Show</label>
+                <select id="limit-top" name="limit">
+                    <option value="{url path="{category attr="url"}" limit="4"}" {if $limit==4}selected{/if}>4</option>
+                    <option value="{url path="{category attr="url"}" limit="8"}" {if $limit==8}selected{/if}>8</option>
+                    <option value="{url path="{category attr="url"}" limit="12"}" {if $limit==12}selected{/if}>12</option>
+                    <option value="{url path="{category attr="url"}" limit="50"}"{if $limit==50}selected{/if}>50</option>
+                    <option value="{url path="{category attr="url"}" limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
+                </select>
+                <span class="per-page"> per page</span>
+            </span><!-- /.limiter -->
+
+            <span class="sort-by">
+                <label for="sortby-top">{intl l="Sort By"}</label>
+                <select id="sortby-top" name="sortby">
+                    {*<option value="{url path="{category attr="url"}" order="manual"}">{intl l="Position"}</option>*}
+                    <option value="{url path="{category attr="url"}" limit=$limit order="alpha"}" {if $order=="alpha"}selected{/if}>{intl l="Name ascending"}</option>
+                    <option value="{url path="{category attr="url"}" limit=$limit order="alpha_reverse"}" {if $order=="alpha_reverse"}selected{/if}>{intl l="Name descending"}</option>
+                    <option value="{url path="{category attr="url"}" limit=$limit order="min_price"}" {if $order=="min_price"}selected{/if}>{intl l="Price ascending"}</option>
+                    <option value="{url path="{category attr="url"}" limit=$limit order="max_price"}" {if $order=="max_price"}selected{/if}>{intl l="Price descending"}</option>
+                    {*<option value="{url path="{category attr="url"}" order="rating"}">{intl l="Rating"}</option>*}
+                </select>
+            </span><!-- /.sort-by -->
+
+            <span class="view-mode">
+                <span class="view-mode-label">{intl l="View as"}:</span>
+                <span class="view-mode-btn">
+                    <a href="{url path="{navigate to="current"}" mode="grid"}" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
+                    <a href="{url path="{navigate to="current"}" mode="list"}" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
+                </span>
+            </span><!-- /.view-mode -->
+
+    </div><!-- /.sorter -->
+    {else}
+    <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}}">
+        <strong id="pagination-label-{$toolbar}}" class="pagination-label">{intl l="Pagination"}</strong>
+        <ul class="pagination">
+
+            {if $product_page > 1}
+                <li><a href="{url path={navigate to="current"} page={$product_page-1} }" class="prev"><i class="icon-prev"></i></a></li>
+            {else}
+                <li><a href="#" class="prev"><i class="icon-prev"></i></a></li>
+            {/if}
+            {pageloop rel="product_list"}
+            {if $PAGE != $CURRENT}
+                <li><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
+            {else}
+                <li class="active"><a href="#" tabindex="-1">{$PAGE}</a></li>
+            {/if}
+            {if $PAGE == $LAST}
+                {if $CURRENT < $LAST}
+                    <li><a href="{url path={navigate to="current"} page={$CURRENT+1} }" class="next"><i class="icon-next"></i></a></li>
+                {else}
+                    <li><a href="#" class="next"><i class="icon-next"></i></a></li>
+                {/if}
+
+            {/if}
+            {/pageloop}
+        </ul>
+    </div>
+    {/if}
+</div><!-- /.toolbar toolbar-<?php echo $toolbar; ?> -->
diff --git a/templates/default/includes/menu.html b/templates/default/includes/menu.html
new file mode 100644
index 000000000..083c74ef2
--- /dev/null
+++ b/templates/default/includes/menu.html
@@ -0,0 +1,27 @@
+<section id="categories" class="block block-nav" role="navigation" aria-labelledby="categories-label">
+    <div class="block-heading"><h3 class="block-title" id="categories-label">{intl l="Categories"}</h3></div>
+    <div class="block-content">
+        <nav class="nav-categories">
+            <ul id="category" class="accordion">
+                {assign "previousLevel" 0}
+                {loop name="cat-parent" type="category-tree" category="0"}
+
+                {for $foo=1 to $previousLevel-$LEVEL}
+            </ul>
+            </li>
+            {/for}
+
+            {if $CHILD_COUNT > 0 }
+            <li><a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="{$URL}#collapse{$ID}">{$TITLE} <span class="amount">({$CHILD_COUNT})</span></a>
+
+                <ul id="collapse{$ID}" class="collapse">
+                    {else}
+
+                    <li><a href="{$URL}">{$TITLE} <span class="amount">(0)</span></a></li>
+                    {/if}
+                    {assign "previousLevel" $LEVEL}
+                    {/loop}
+                </ul>
+        </nav>
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/default/includes/single-product.html b/templates/default/includes/single-product.html
new file mode 100644
index 000000000..bca37f80b
--- /dev/null
+++ b/templates/default/includes/single-product.html
@@ -0,0 +1,65 @@
+<li class="item">
+<article itemscope itemtype="http://schema.org/Product">
+    <!-- Use the meta tag to specify content that is not visible on the page in any way -->
+    {loop name="brand.feature" type="feature" product=$ID title="brand"}
+    {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+        <meta itemprop="brand" content="{$TITLE}">
+    {/loop}
+    {/loop}
+    {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+    {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+        <meta itemprop="productID" content="isbn:{$TITLE}">
+    {/loop}
+    {/loop}
+
+    <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
+        {loop name="product_thumbnail" type="image" product=$ID width="{$width}" height="{$height}" resize_mode="borders" limit="1"}
+            <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
+        {/loop}
+        {elseloop rel="product_thumbnail"}
+            {images file="../assets/img/{$width}x{$height}.png"}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
+        {/elseloop}
+        <span class="mask"></span>
+    </a>
+
+    <div class="product-info">
+        <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
+        {if $hasDescription}
+        <div class="description" itemprop="description">
+            <p>{$DESCRIPTION}</p>
+        </div>
+        {/if}
+    </div>
+
+    <div class="product-price">
+        <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+            <meta itemprop="category" content="{category attr="title"}">
+            <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
+            <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+            <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
+            <!-- List of availibility :
+                out_of_stock : http://schema.org/OutOfStock
+                in_stock : http://schema.org/InStock
+                instore_only : http://schema.org/InStoreOnly
+                preorder : http://schema.org/PreOrder
+                online_only : http://schema.org/OnlineOnly
+            -->
+            {if $IS_PROMO }
+                {loop name="productSaleElements_promo" type="product_sale_elements" product=$ID limit="1" order="min_price"}
+                {assign var="default_product_sale_elements" value=$ID}
+                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></span>
+                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span></span>
+                {/loop}
+            {else}
+                <span class="regular-price"><span itemprop="price" class="price">{format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"}</span></span>
+            {/if}
+
+        </div>
+        {if $hasBtn}
+        <div class="product-btn">
+            <button class="btn btn-cart">Add to cart</button>
+        </div>
+        {/if}
+    </div>
+</article><!-- /product -->
+</li>
\ No newline at end of file
diff --git a/templates/default/index.html b/templates/default/index.html
index b762df42f..390f06965 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -34,8 +34,17 @@
                 <li class="item">
                     <article itemscope itemtype="http://schema.org/Product">
                         <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                        <meta itemprop="brand" content="Diesel">
-                        <meta itemprop="productID" content="isbn:925872">
+                        {$product_id=$ID}
+                        {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
+                            {loop name="brand.value" type="feature_value" feature="{$ID}" product="$product_id"}
+                                <meta itemprop="brand" content="{$TITLE}">
+                            {/loop}
+                        {/loop}
+                        {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                            {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                                <meta itemprop="productID" content="isbn:{$TITLE}">
+                            {/loop}
+                        {/loop}
 
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_new" }
@@ -57,7 +66,9 @@
 
                             <div class="product-price">
                                 <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                    <meta itemprop="category" content="Category1">
+                                    {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
+                                        <meta itemprop="category" content="{$TITLE}">
+                                    {/loop}
                                     <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
                                     <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                                     <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
@@ -69,8 +80,7 @@
                                             preorder : http://schema.org/PreOrder
                                             online_only : http://schema.org/OnlineOnly
                                     -->
-                                    <span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{$BEST_TAXED_PRICE}"}
-</span></span>
+                                    <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                                 </div>
                             </div>
                         </a>
@@ -90,51 +100,7 @@
         <div class="products-content">
             <ul class="products-grid product-col-5 hover-effect">
                 {loop name="product_promo" type="product" limit="5" promo="yes"}
-                <li class="item">
-                    <article itemscope itemtype="http://schema.org/Product">
-                        <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                        <meta itemprop="brand" content="Diesel">
-                        <meta itemprop="productID" content="isbn:925872">
-
-                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-                            {ifloop rel="image_product_promo" }
-                            <img itemprop="image"
-                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}" width="218" height="146" resize_mode="borders"}
-                                        src="{$IMAGE_URL}"
-                                    {/loop}
-                                 alt="Product #{$LOOP_COUNT}" >
-                            {/ifloop}
-                            {elseloop rel="image_product_promo"}
-                                {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{$LOOP_COUNT}">{/images}
-                            {/elseloop}
-                            <span class="mask"></span>
-                        </a>
-
-                        <div class="product-info">
-                            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$CHAPO}</span></a></h3>
-                        </div>
-
-                        <div class="product-price">
-                            <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                <meta itemprop="category" content="Category1">
-                                <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                                <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
-                                <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
-                                <!-- List of availibility :
-                                    out_of_stock : http://schema.org/OutOfStock
-                                    in_stock : http://schema.org/InStock
-                                    instore_only : http://schema.org/InStoreOnly
-                                    preorder : http://schema.org/PreOrder
-                                    online_only : http://schema.org/OnlineOnly
-                                -->
-                                {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
-                                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
-                                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
-                                {/loop}
-                            </div>
-                        </div>
-                    </article><!-- /product -->
-                </li>
+                    {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"}
                 {/loop}
 
             </ul>
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 7834bc706..37cbad224 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -314,10 +314,10 @@ URL: http://www.thelia.net
                                     </address>
                                 </li>
                                 <li class="contact-phone">
-                                    <span class="tel" itemprop="telephone">+33 09 08 07 06 05</span>
+                                    <span class="tel" itemprop="telephone">+33 04 44 05 31 00</span>
                                 </li>
                                 <li class="contact-email">
-                                    <a href="mailto:demo@thelia.net" class="email" itemprop="email">demo@thelia.net</a>
+                                    <a href="mailto:demo@thelia.net" class="email" itemprop="email">info@thelia.net</a>
                                 </li>
                             </ul>
                         </div>
diff --git a/templates/default/login.html b/templates/default/login.html
index 7a2da400a..11c86b908 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -4,7 +4,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Login"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/password.html b/templates/default/password.html
index ec472a1f9..9168bd0a3 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -4,7 +4,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"} </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Password"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/product.html b/templates/default/product.html
index f5224a9d2..dc89eb03b 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -2,12 +2,15 @@
 
 {block name="breadcrumb"}
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
+        <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="category.php" itemprop="url"><span itemprop="title">Category 1</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="category.php" itemprop="url"><span itemprop="title">Category 1.2</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">Product name</span></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            {loop type="product" name="product_breadcrumb" id="{product attr="id"}"}
+                {loop name="category_path" type="category-path" category="{$DEFAULT_CATEGORY}"}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{$URL}" itemprop="url"><span itemprop="title">{$TITLE}</span></a></li>
+                {/loop}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{$TITLE}</span></li>
+            {/loop}
         </ul>
     </nav><!-- /.nav-breadcrumb -->
 {/block}
@@ -23,11 +26,11 @@
                     <meta itemprop="brand" content="{$TITLE}">
                 {/loop}
             {/loop}
-
-            <!--
-                activate this meta tag if you have isbn feature for exemple
-                <meta itemprop="productID" content="isbn:925872">
-            -->
+            {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                    <meta itemprop="productID" content="isbn:{$TITLE}">
+                {/loop}
+            {/loop}
 
             <section id="product-gallery">
                 <figure class="product-image">
@@ -55,10 +58,10 @@
                         <div class="item">
                             <ul>
 
-                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5"}
+                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" offset="5"}
                                     <li>
                                         <a href="{$IMAGE_URL}" class="thumbnail">
-                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop"}
+                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
                                                 <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                             {/loop}
                                         </a>
@@ -90,7 +93,9 @@
                     <div class="availability"><span class="availibity-label">{intl l="Availability"}: </span><span itemprop="availability" href="http://schema.org/InStock" class="in-stock">In stock</span></div>
 
                     <div class="price-container">
-                        <meta itemprop="category" content="Category1">
+                        {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
+                            <meta itemprop="category" content="{$TITLE}">
+                        {/loop}
                         <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
                         <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                         <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
@@ -108,7 +113,7 @@
                             <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                         {/loop}
                         {else}
-                            <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                            <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                         {/if}
                     </div>
                 </div>
@@ -193,7 +198,17 @@
                         <p>{$DESCRIPTION}</p>
                     </div>
                     <div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">
-                        <p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
+                        {ifloop rel="feature_value_info"}
+                        <ul>
+                        {loop name="feature_info" type="feature" product="{$ID}"}
+                            <li> <strong>{$TITLE}</strong> :
+                            {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
+                                {$TITLE}
+                            {/loop}
+                            </li>
+                        {/loop}
+                        </ul>
+                        {/ifloop}
                     </div>
                 </div>
             </section>
diff --git a/templates/default/register.html b/templates/default/register.html
index a3448932b..ad7945457 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -4,7 +4,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Register"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->