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/default/category.html b/templates/default/category.html
index 8bca4fbde..3ac31189a 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -17,3 +17,173 @@
         </ul>
     </nav><!-- /.nav-breadcrumb -->
 {/block}
+
+{block name="main-content"}
+    <div class="main layout-col-2-left">
+
+        <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
+            {include file="includes/category-toolbar.html" toolbar="top"}
+            <div id="category-products">
+                <div class="products-content">
+                    <ul class="product-col-4">
+                        {loop type="product" name="product_list" category={category attr="id"}}
+
+                        <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">
+                                {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
+                                    <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
+                                {/loop}
+                                {elseloop rel="product_thumbnail"}
+                                    {images file='assets/img/218x146.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>
+
+                                <div class="description" itemprop="description">
+                                    <p>{$DESCRIPTION}</p>
+                                </div>
+                            </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="USD"> <!-- 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>
+                                <div class="product-btn">
+                                    <a class="btn btn-cart" href="#">Add to cart</a>
+                                </div>
+                            </div>
+                        </article><!-- /product -->
+                        </li>
+                        {/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">
+
+            <section id="categories" class="block block-nav" role="navigation" aria-labelledby="categories-label">
+                <div class="block-heading"><h3 class="block-title" id="categories-label">Categories</h3></div>
+                <div class="block-content">
+                    <nav class="nav-categories">
+                        <ul id="category" class="accordion">
+                            <li>
+                                <a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="#collapse1">Category 1 <span class="amount">(3)</span></a>
+                                <ul id="collapse1" class="in">
+                                    <li>
+                                        <a href="#collapse11" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse1">Category 1.1 <span class="amount">(3)</span></a>
+                                        <ul id="collapse11" class="collapse">
+                                            <li><a href="#">Category 1.1.1 <span class="amount">(0)</span></a></li>
+                                            <li>
+                                                <a href="#collapse112" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse11">Category 1.1.2 <span class="amount">(2)</span></a>
+                                                <ul id="collapse112" class="collapse">
+                                                    <li><a href="#">Category 1.1.2.1 <span class="amount">(0)</span></a></li>
+                                                    <li><a href="#">Category 1.1.2.2 <span class="amount">(0)</span></a></li>
+                                                </ul>
+
+                                            </li>
+                                            <li><a href="#">Category 1.1.3 <span class="amount">(0)</span></a></li>
+                                        </ul>
+
+                                    </li>
+                                    <li><a href="#">Category 1.2 <span class="amount">(0)</span></a></li>
+                                    <li><a href="#">Category 1.3 <span class="amount">(0)</span></a></li>
+                                </ul>
+                            </li>
+                            <li><a href="#">Category 2 <span class="amount">(0)</span></a></li>
+                            <li><a href="#">Category 3 <span class="amount">(0)</span></a></li>
+                            <li><a href="#">Category 4 <span class="amount">(0)</span></a></li>
+                        </ul>
+                    </nav>
+                </div>
+            </section>
+
+            <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">
+                                <?php for ($count = 1; $count <= $type; $count++) { ?>
+                                <div class="checkbox">
+                                    <label for="type<?php echo $count; ?>">
+                                        <input type="checkbox" name="type<?php echo $count; ?>" id="type<?php echo $count; ?>"<?php if(isset($_GET['type'. $count])) { echo ' checked'; }?> value="<?php echo $count; ?>"> Type <?php echo $count; ?>
+                                    </label>
+                                </div>
+                                <?php } ?>
+                            </div>
+                        </fieldset>
+                    </div><!-- /Filter Type -->
+
+                    <div class="filter filter-price">
+                        <fieldset>
+                            <legend class="filter-heading">Price</legend>
+                            <div class="filter-content">
+                                <?php foreach ($price as $key => $value) { ?>
+                                <div class="checkbox">
+                                    <label for="price<?php echo $key; ?>">
+                                        <input type="checkbox" name="price<?php echo $key; ?>" id="price<?php echo $key; ?>"<?php if(isset($_GET['price'. $key])) { echo ' checked'; }?> value="<?php echo $value; ?>"> <?php echo $value; ?>
+                                    </label>
+                                </div>
+                                <?php } ?>
+                            </div>
+                        </fieldset>
+                    </div><!-- /Filter Price -->
+
+                    <div class="filter filter-size">
+                        <fieldset>
+                            <legend class="filter-heading">Size</legend>
+                            <div class="filter-content">
+                                <?php foreach ($size as $key => $value) { ?>
+                                <div class="checkbox">
+                                    <label for="size<?php echo $key; ?>">
+                                        <input type="checkbox" name="size<?php echo $key; ?>" id="size<?php echo $key; ?>"<?php if(isset($_GET['size'. $key])) { echo ' checked'; }?> value="<?php echo $key; ?>"> <?php echo $value; ?>
+                                    </label>
+                                </div>
+                                <?php } ?>
+                            </div>
+                        </fieldset>
+                    </div><!-- /Filter Size -->
+
+                    <div class="group-btn">
+                        <button type="submit" class="btn btn-filter">Submit</button>
+                    </div>
+                </form>
+            </section><!-- /.filters -->
+
+        </aside>
+
+    </div>
+
+    </div><!-- /.container -->
+{/block}
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
new file mode 100644
index 000000000..59a78151e
--- /dev/null
+++ b/templates/default/includes/category-toolbar.html
@@ -0,0 +1,52 @@
+<div class="toolbar toolbar-{$toolbar}" role="toolbar">
+    <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="?limit=4">4</option>
+                    <option value="?limit=8" selected>8</option>
+                    <option value="?limit=12">12</option>
+                    <option value="?limit=50">50</option>
+                    <option value="?limit=all">All</option>
+                </select>
+                <span class="per-page"> per page</span>
+            </span><!-- /.limiter -->
+
+            <span class="sort-by">
+                <label for="sortby-top">Sort By</label>
+                <select id="sortby-top" name="sortby" onchange="">
+                    <option value="?order=position">Position</option>
+                    <option value="?order=name" selected>Name</option>
+                    <option value="?order=price">Price</option>
+                    <option value="?order=rating">Rating</option>
+                </select>
+
+                <a class="sort-order" href="?dir=desc" title="Set Descending Direction"><i class="icon-long-arrow-up"></i></a>
+
+            </span><!-- /.sort-by -->
+
+            <span class="view-mode">
+                <span class="view-mode-label">View as:</span>
+                <span class="view-mode-btn">
+                    <a href="?mode=grid" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
+                    <a href="?mode=list" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
+                </span>
+            </span><!-- /.view-mode -->
+
+    </div><!-- /.sorter -->
+
+    <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}">
+        <strong id="pagination-label-{$toolbar}" class="pagination-label">Pagination</strong>
+        <ul class="pagination">
+            <li><a href="?page=<?php echo $page-1; ?>" class="prev"><i class="icon-prev"></i></a></li>
+            <li class="active"><a href="?page=1" tabindex="-1"'; >1</a></li>
+            <li><a href="?page=2">2</a></li>
+            <li><a href="?page=3">3</a></li>
+            <li><a href="?page=4">4</a></li>
+            <li><a href="?page=5">5</a></li>
+            <li><a href="?page=<?php echo $page+1; ?>" class="next"><i class="icon-next"></i></a></li>
+        </ul>
+    </div>
+</div><!-- /.toolbar toolbar-<?php echo $toolbar; ?> -->
diff --git a/templates/default/product.html b/templates/default/product.html
index c2135d232..63ad2364b 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -58,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>
@@ -111,7 +111,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>