diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php
index 427227f1c..e4004de1e 100755
--- a/templates/default/I18n/es_ES.php
+++ b/templates/default/I18n/es_ES.php
@@ -1,214 +1,229 @@
 <?php
 
 return array (
-  '+ View All' => '',
-  'Thelia V2' => '',
-  'Skip to content' => '',
-  'Toggle navigation' => '',
-  'Main Navigation' => '',
-  'Register!' => '',
-  'Log In!' => '',
-  'Sign In' => '',
-  'Register' => '',
-  'Cart' => '',
-  'View Cart' => '',
-  'Checkout' => '',
-  'You have no items in your shopping cart.' => '',
-  'Home' => '',
-  'Search a product' => '',
-  'Search...' => '',
-  'Minimum 2 characters.' => '',
-  'Search' => '',
-  'Language:' => '',
-  'Currency:' => '',
-  'Latest' => '',
-  'Offers' => '',
-  'Special Price:' => '',
-  'Regular Price:' => '',
-  'Free shipping' => '',
-  'Orders over $50' => '',
-  'Secure payment' => '',
-  'Multi-payment platform' => '',
-  'Need help ?' => '',
-  'Questions ? See or F.A.Q.' => '',
-  'Latest articles' => '',
-  'No articles currently' => '',
-  'Useful links' => '',
-  'Login' => '',
-  'Follow us' => '',
-  'Newsletter' => '',
-  'Sign up to receive our latest news.' => '',
-  'Email address' => '',
-  'Your email address' => '',
-  'Subscribe' => '',
-  'Contact Us' => '',
-  'Copyright' => '',
-  'You are here:' => '',
-  'Show' => '',
-  'per page' => '',
-  'Sort By' => '',
-  'Name ascending' => '',
-  'Name descending' => '',
-  'Price ascending' => '',
-  'Price descending' => '',
-  'View as' => '',
-  'View product' => '',
-  'Pagination' => '',
-  'No products available in this category' => '',
-  'Categories' => '',
-  'Ref.' => '',
-  'Availability' => '',
-  'In stock' => '',
-  'Out of stock' => '',
-  'Add to cart' => '',
-  'Description' => '',
-  'Additional Info' => '',
-  'View cart' => '',
-  'Continue Shopping' => '',
-  'Upsell Products' => '',
-  'Your Cart' => '',
-  'Billing and delivery' => '',
-  'Check my order' => '',
-  'Product Name' => '',
-  'Name' => '',
-  'Unit Price' => '',
-  'Price' => '',
-  'Quantity' => '',
-  'Qty' => '',
-  'Total' => '',
-  'Tax Inclusive' => '',
-  'TTC' => '',
-  'Available' => '',
-  'In Stock' => '',
-  'No.' => '',
-  'Remove' => '',
-  'Proceed checkout' => '',
-  'Warning' => '',
-  'missing or invalid data' => '',
-  'Do you have an account?' => '',
-  'Forgot your Password?' => '',
-  'Next' => '',
-  'Log out!' => '',
-  'My Account' => '',
-  'Previous product' => '',
-  'Next product' => '',
-  'instead of' => '',
-  'Add a new address' => '',
-  'Choose your delivery address' => '',
-  'Address %nb' => '',
-  'Edit this address' => '',
-  'Edit' => '',
-  'Remove this address' => '',
-  'Cancel' => '',
-  'Choose your delivery method' => '',
-  'Back' => '',
-  'Next Step' => '',
-  'Delete address' => '',
-  'Do you really want to delete this address ?' => '',
-  'No' => '',
-  'Yes' => '',
-  'Shipping Tax' => '',
-  'You may have a coupon ?' => '',
-  'Code :' => '',
-  'Coupon code' => '',
-  'Ok' => '',
-  'Delivery address' => '',
-  'Billing address' => '',
-  'Change address' => '',
-  'Choose your payment method' => '',
-  'Secure Payment' => '',
-  'You choose to pay by' => '',
-  'Thank you for the trust you place in us.' => '',
-  'A summary of your order email has been sent to the following address' => '',
-  'Your order will be confirmed by us upon receipt of your payment.' => '',
-  'Order number' => '',
-  'Date' => '',
-  'Go home' => '',
-  'Account' => '',
-  'Personal Information' => '',
-  'Change my account information' => '',
-  'Change my password' => '',
-  'My Address book' => '',
-  'My Address Books' => '',
-  'My Orders' => '',
-  'List of orders' => '',
-  'Order Number' => '',
-  'Amount' => '',
-  'Status' => '',
-  'View' => '',
-  'View order %ref as pdf document' => '',
-  'Order details' => '',
-  'You don\'t have orders yet.' => '',
-  'Update Profile' => '',
-  'Personal Informations' => '',
-  'Select Title' => '',
-  'Update' => '',
-  'Change Password' => '',
-  'Login Information' => '',
-  'Create New Address' => '',
-  'Address' => '',
-  'Home address' => '',
-  'Complementary address' => '',
-  'Select Country' => '',
-  'Create' => '',
-  'Related' => '',
-  'Grid' => '',
-  'List' => '',
-  'Next' => '',
-  'Previous' => '',
-/*
-  'The page cannot be found' => '',
-  'What\'s your name?' => '',
-  'So I can get back to you.' => '',
-  'The subject of your message.' => '',
-  'And your message...' => '',
-  'This email already exists.' => '',
-  'Address label' => '',
-  'Title' => '',
-  'First Name' => '',
-  'Last Name' => '',
-  'Company Name' => '',
-  'Street Address' => '',
-  'Address Line 2' => '',
-  'Address Line 3' => '',
-  'City' => '',
-  'Zip code' => '',
-  'Country' => '',
-  'Phone' => '',
-  'Cellphone' => '',
-  'Make this address as my primary address' => '',
-  'Full Name' => '',
-  'Your Email Address' => '',
-  'Subject' => '',
-  'Your Message' => '',
-  'Please enter your email address' => '',
-  'No, I am a new customer.' => '',
-  'Yes, I have a password :' => '',
-  'Please enter your password' => '',
-  'This value should not be blank.' => '',
-  'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-  'This email does not exists' => '',
-  'Current Password' => '',
-  'New Password' => '',
-  'Password confirmation' => '',
-  'Your current password does not match.' => '',
-  'Password confirmation is not the same as password field.' => '',
-  'I would like to receive the newsletter or the latest news.' => '',
-*/
-  'Placeholder firstname' => '',
-  'Placeholder lastname' => '',
-  'Placeholder email' => '',
-  'Placeholder phone' => '',
-  'Placeholder cellphone' => '',
-  'Placeholder company' => '',
-  'Placeholder address1' => '',
-  'Placeholder address2' => '',
-  'Placeholder city' => '',
-  'Placeholder zipcode' => '',
-  'Placeholder address label' => '',
-  'Placeholder contact name' => '',
-  'Placeholder contact email' => '',
-  'Placeholder contact subject' => '',
-  'Placeholder contact message' => '',
+    '+ View All' => '',
+    'Thelia V2' => '',
+    'Skip to content' => '',
+    'Toggle navigation' => '',
+    'Main Navigation' => '',
+    'Register!' => '',
+    'Log In!' => '',
+    'Sign In' => '',
+    'Register' => '',
+    'Cart' => '',
+    'View Cart' => '',
+    'Checkout' => '',
+    'You have no items in your shopping cart.' => '',
+    'Home' => '',
+    'Search a product' => '',
+    'Search...' => '',
+    'Minimum 2 characters.' => '',
+    'Search' => '',
+    'Language:' => '',
+    'Currency:' => '',
+    'Latest' => '',
+    'Offers' => '',
+    'Special Price:' => '',
+    'Regular Price:' => '',
+    'Free shipping' => '',
+    'Orders over $50' => '',
+    'Secure payment' => '',
+    'Multi-payment platform' => '',
+    'Need help ?' => '',
+    'Questions ? See or F.A.Q.' => '',
+    'Latest articles' => '',
+    'No articles currently' => '',
+    'Useful links' => '',
+    'Login' => '',
+    'Follow us' => '',
+    'Newsletter' => '',
+    'Sign up to receive our latest news.' => '',
+    'Email address' => '',
+    'Your email address' => '',
+    'Subscribe' => '',
+    'Contact Us' => '',
+    'Copyright' => '',
+    'You are here:' => '',
+    'Show' => '',
+    'per page' => '',
+    'Sort By' => '',
+    'Name ascending' => '',
+    'Name descending' => '',
+    'Price ascending' => '',
+    'Price descending' => '',
+    'View as' => '',
+    'View product' => '',
+    'Pagination' => '',
+    'No products available in this category' => '',
+    'Categories' => '',
+    'Ref.' => '',
+    'Availability' => '',
+    'In stock' => '',
+    'Out of stock' => '',
+    'Add to cart' => '',
+    'Description' => '',
+    'Additional Info' => '',
+    'View cart' => '',
+    'Continue Shopping' => '',
+    'Upsell Products' => '',
+    'Your Cart' => '',
+    'Billing and delivery' => '',
+    'Check my order' => '',
+    'Product Name' => '',
+    'Name' => '',
+    'Unit Price' => '',
+    'Price' => '',
+    'Quantity' => '',
+    'Qty' => '',
+    'Total' => '',
+    'Tax Inclusive' => '',
+    'TTC' => '',
+    'Available' => '',
+    'In Stock' => '',
+    'No.' => '',
+    'Remove' => '',
+    'Proceed checkout' => '',
+    'Warning' => '',
+    'missing or invalid data' => '',
+    'Do you have an account?' => '',
+    'Forgot your Password?' => '',
+    'Next' => '',
+    'Log out!' => '',
+    'My Account' => '',
+    'Previous product' => '',
+    'Next product' => '',
+    'instead of' => '',
+    'Add a new address' => '',
+    'Choose your delivery address' => '',
+    'Address %nb' => '',
+    'Edit this address' => '',
+    'Edit' => '',
+    'Remove this address' => '',
+    'Cancel' => '',
+    'Choose your delivery method' => '',
+    'Back' => '',
+    'Next Step' => '',
+    'Delete address' => '',
+    'Do you really want to delete this address ?' => '',
+    'No' => '',
+    'Yes' => '',
+    'Shipping Tax' => '',
+    'You may have a coupon ?' => '',
+    'Code :' => '',
+    'Coupon code' => '',
+    'Ok' => '',
+    'Delivery address' => '',
+    'Billing address' => '',
+    'Change address' => '',
+    'Choose your payment method' => '',
+    'Secure Payment' => '',
+    'You choose to pay by' => '',
+    'Thank you for the trust you place in us.' => '',
+    'A summary of your order email has been sent to the following address' => '',
+    'Your order will be confirmed by us upon receipt of your payment.' => '',
+    'Order number' => '',
+    'Date' => '',
+    'Go home' => '',
+    'Account' => '',
+    'Personal Information' => '',
+    'Change my account information' => '',
+    'Change my password' => '',
+    'My Address book' => '',
+    'My Address Books' => '',
+    'My Orders' => '',
+    'List of orders' => '',
+    'Order Number' => '',
+    'Amount' => '',
+    'Status' => '',
+    'View' => '',
+    'View order %ref as pdf document' => '',
+    'Order details' => '',
+    'You don\'t have orders yet.' => '',
+    'Update Profile' => '',
+    'Personal Informations' => '',
+    'Select Title' => '',
+    'Update' => '',
+    'Change Password' => '',
+    'Login Information' => '',
+    'Create New Address' => '',
+    'Address' => '',
+    'Home address' => '',
+    'Complementary address' => '',
+    'Select Country' => '',
+    'Create' => '',
+    'Related' => '',
+    'Grid' => '',
+    'List' => '',
+    'Next' => '',
+    'Previous' => '',
+    '%nb Items' => '',
+    '%nb Item' => '',
+    'Latest products' => '',
+    'Product Offers' => '',
+    /*
+    'The page cannot be found' => '',
+    'What\'s your name?' => '',
+    'So I can get back to you.' => '',
+    'The subject of your message.' => '',
+    'And your message...' => '',
+    'This email already exists.' => '',
+    'Address label' => '',
+    'Title' => '',
+    'First Name' => '',
+    'Last Name' => '',
+    'Company Name' => '',
+    'Street Address' => '',
+    'Address Line 2' => '',
+    'Address Line 3' => '',
+    'City' => '',
+    'Zip code' => '',
+    'Country' => '',
+    'Phone' => '',
+    'Cellphone' => '',
+    'Make this address as my primary address' => '',
+    'Full Name' => '',
+    'Your Email Address' => '',
+    'Subject' => '',
+    'Your Message' => '',
+    'Please enter your email address' => '',
+    'No, I am a new customer.' => '',
+    'Yes, I have a password :' => '',
+    'Please enter your password' => '',
+    'This value should not be blank.' => '',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
+    'This email does not exists' => '',
+    'Current Password' => '',
+    'New Password' => '',
+    'Password confirmation' => '',
+    'Your current password does not match.' => '',
+    'Password confirmation is not the same as password field.' => '',
+    'I would like to receive the newsletter or the latest news.' => '',
+    */
+    // Product Empty
+    'Product Empty Title' => 'Welcome',
+    'Product Empty Message' => 'It\'s really quick to add a product.
+      <ol>
+          <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+          <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+      </ol>',
+    'Product Empty Button' => 'Add my first product',
+    'Demo product title' => 'Demo product title',
+    'Demo product description' => 'Demo product description',
+    // Placeholder
+    'Placeholder firstname' => '',
+    'Placeholder lastname' => '',
+    'Placeholder email' => '',
+    'Placeholder phone' => '',
+    'Placeholder cellphone' => '',
+    'Placeholder company' => '',
+    'Placeholder address1' => '',
+    'Placeholder address2' => '',
+    'Placeholder city' => '',
+    'Placeholder zipcode' => '',
+    'Placeholder address label' => '',
+    'Placeholder contact name' => '',
+    'Placeholder contact email' => '',
+    'Placeholder contact subject' => '',
+    'Placeholder contact message' => '',
 )
 ;
\ No newline at end of file
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index b5f6a6290..9e00957cb 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -156,6 +156,10 @@ return array (
     'List' => 'Liste',
     'Next' => 'Suivant',
     'Previous' => 'Précédent',
+    '%nb Items' => '%nb produits',
+    '%nb Item' => '%nb produit',
+    'Latest products' => 'Derniers produits',
+    'Product Offers' => 'Produits en promotion',
 
     /*
       'The page cannot be found' => '',
@@ -196,6 +200,17 @@ return array (
       'Password confirmation is not the same as password field.' => '',
       'I would like to receive the newsletter or the latest news.' => '',
     */
+    // Product Empty
+    'Product Empty Title' => 'Bonjour',
+    'Product Empty Message' => 'C\'est très simple d\'ajouter un produit dans l\'adminsitration.
+        <ol>
+            <li>N\'oubliez pas de sélectionner <strong>NEW</strong> dans l\'onglet Details afin de voir votre produit dans la section des nouveautés.</li>
+            <li>N\'oubliez pas de sélectionner <strong>SALE</strong> dans l\'onglet Details afin de voir votre produit dans la section des promotions.</li>
+        </ol>',
+    'Product Empty Button' => 'Ajouter mon premier produit',
+    'Demo product title' => 'Example de titre',
+    'Demo product description' => 'Example de description de produit',
+    // Placeholder
     'Placeholder firstname' => 'Prénom',
     'Placeholder lastname' => 'Nom de famille',
     'Placeholder email' => 'Adresse e-mail',
diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php
index 427227f1c..e4004de1e 100755
--- a/templates/default/I18n/it_IT.php
+++ b/templates/default/I18n/it_IT.php
@@ -1,214 +1,229 @@
 <?php
 
 return array (
-  '+ View All' => '',
-  'Thelia V2' => '',
-  'Skip to content' => '',
-  'Toggle navigation' => '',
-  'Main Navigation' => '',
-  'Register!' => '',
-  'Log In!' => '',
-  'Sign In' => '',
-  'Register' => '',
-  'Cart' => '',
-  'View Cart' => '',
-  'Checkout' => '',
-  'You have no items in your shopping cart.' => '',
-  'Home' => '',
-  'Search a product' => '',
-  'Search...' => '',
-  'Minimum 2 characters.' => '',
-  'Search' => '',
-  'Language:' => '',
-  'Currency:' => '',
-  'Latest' => '',
-  'Offers' => '',
-  'Special Price:' => '',
-  'Regular Price:' => '',
-  'Free shipping' => '',
-  'Orders over $50' => '',
-  'Secure payment' => '',
-  'Multi-payment platform' => '',
-  'Need help ?' => '',
-  'Questions ? See or F.A.Q.' => '',
-  'Latest articles' => '',
-  'No articles currently' => '',
-  'Useful links' => '',
-  'Login' => '',
-  'Follow us' => '',
-  'Newsletter' => '',
-  'Sign up to receive our latest news.' => '',
-  'Email address' => '',
-  'Your email address' => '',
-  'Subscribe' => '',
-  'Contact Us' => '',
-  'Copyright' => '',
-  'You are here:' => '',
-  'Show' => '',
-  'per page' => '',
-  'Sort By' => '',
-  'Name ascending' => '',
-  'Name descending' => '',
-  'Price ascending' => '',
-  'Price descending' => '',
-  'View as' => '',
-  'View product' => '',
-  'Pagination' => '',
-  'No products available in this category' => '',
-  'Categories' => '',
-  'Ref.' => '',
-  'Availability' => '',
-  'In stock' => '',
-  'Out of stock' => '',
-  'Add to cart' => '',
-  'Description' => '',
-  'Additional Info' => '',
-  'View cart' => '',
-  'Continue Shopping' => '',
-  'Upsell Products' => '',
-  'Your Cart' => '',
-  'Billing and delivery' => '',
-  'Check my order' => '',
-  'Product Name' => '',
-  'Name' => '',
-  'Unit Price' => '',
-  'Price' => '',
-  'Quantity' => '',
-  'Qty' => '',
-  'Total' => '',
-  'Tax Inclusive' => '',
-  'TTC' => '',
-  'Available' => '',
-  'In Stock' => '',
-  'No.' => '',
-  'Remove' => '',
-  'Proceed checkout' => '',
-  'Warning' => '',
-  'missing or invalid data' => '',
-  'Do you have an account?' => '',
-  'Forgot your Password?' => '',
-  'Next' => '',
-  'Log out!' => '',
-  'My Account' => '',
-  'Previous product' => '',
-  'Next product' => '',
-  'instead of' => '',
-  'Add a new address' => '',
-  'Choose your delivery address' => '',
-  'Address %nb' => '',
-  'Edit this address' => '',
-  'Edit' => '',
-  'Remove this address' => '',
-  'Cancel' => '',
-  'Choose your delivery method' => '',
-  'Back' => '',
-  'Next Step' => '',
-  'Delete address' => '',
-  'Do you really want to delete this address ?' => '',
-  'No' => '',
-  'Yes' => '',
-  'Shipping Tax' => '',
-  'You may have a coupon ?' => '',
-  'Code :' => '',
-  'Coupon code' => '',
-  'Ok' => '',
-  'Delivery address' => '',
-  'Billing address' => '',
-  'Change address' => '',
-  'Choose your payment method' => '',
-  'Secure Payment' => '',
-  'You choose to pay by' => '',
-  'Thank you for the trust you place in us.' => '',
-  'A summary of your order email has been sent to the following address' => '',
-  'Your order will be confirmed by us upon receipt of your payment.' => '',
-  'Order number' => '',
-  'Date' => '',
-  'Go home' => '',
-  'Account' => '',
-  'Personal Information' => '',
-  'Change my account information' => '',
-  'Change my password' => '',
-  'My Address book' => '',
-  'My Address Books' => '',
-  'My Orders' => '',
-  'List of orders' => '',
-  'Order Number' => '',
-  'Amount' => '',
-  'Status' => '',
-  'View' => '',
-  'View order %ref as pdf document' => '',
-  'Order details' => '',
-  'You don\'t have orders yet.' => '',
-  'Update Profile' => '',
-  'Personal Informations' => '',
-  'Select Title' => '',
-  'Update' => '',
-  'Change Password' => '',
-  'Login Information' => '',
-  'Create New Address' => '',
-  'Address' => '',
-  'Home address' => '',
-  'Complementary address' => '',
-  'Select Country' => '',
-  'Create' => '',
-  'Related' => '',
-  'Grid' => '',
-  'List' => '',
-  'Next' => '',
-  'Previous' => '',
-/*
-  'The page cannot be found' => '',
-  'What\'s your name?' => '',
-  'So I can get back to you.' => '',
-  'The subject of your message.' => '',
-  'And your message...' => '',
-  'This email already exists.' => '',
-  'Address label' => '',
-  'Title' => '',
-  'First Name' => '',
-  'Last Name' => '',
-  'Company Name' => '',
-  'Street Address' => '',
-  'Address Line 2' => '',
-  'Address Line 3' => '',
-  'City' => '',
-  'Zip code' => '',
-  'Country' => '',
-  'Phone' => '',
-  'Cellphone' => '',
-  'Make this address as my primary address' => '',
-  'Full Name' => '',
-  'Your Email Address' => '',
-  'Subject' => '',
-  'Your Message' => '',
-  'Please enter your email address' => '',
-  'No, I am a new customer.' => '',
-  'Yes, I have a password :' => '',
-  'Please enter your password' => '',
-  'This value should not be blank.' => '',
-  'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-  'This email does not exists' => '',
-  'Current Password' => '',
-  'New Password' => '',
-  'Password confirmation' => '',
-  'Your current password does not match.' => '',
-  'Password confirmation is not the same as password field.' => '',
-  'I would like to receive the newsletter or the latest news.' => '',
-*/
-  'Placeholder firstname' => '',
-  'Placeholder lastname' => '',
-  'Placeholder email' => '',
-  'Placeholder phone' => '',
-  'Placeholder cellphone' => '',
-  'Placeholder company' => '',
-  'Placeholder address1' => '',
-  'Placeholder address2' => '',
-  'Placeholder city' => '',
-  'Placeholder zipcode' => '',
-  'Placeholder address label' => '',
-  'Placeholder contact name' => '',
-  'Placeholder contact email' => '',
-  'Placeholder contact subject' => '',
-  'Placeholder contact message' => '',
+    '+ View All' => '',
+    'Thelia V2' => '',
+    'Skip to content' => '',
+    'Toggle navigation' => '',
+    'Main Navigation' => '',
+    'Register!' => '',
+    'Log In!' => '',
+    'Sign In' => '',
+    'Register' => '',
+    'Cart' => '',
+    'View Cart' => '',
+    'Checkout' => '',
+    'You have no items in your shopping cart.' => '',
+    'Home' => '',
+    'Search a product' => '',
+    'Search...' => '',
+    'Minimum 2 characters.' => '',
+    'Search' => '',
+    'Language:' => '',
+    'Currency:' => '',
+    'Latest' => '',
+    'Offers' => '',
+    'Special Price:' => '',
+    'Regular Price:' => '',
+    'Free shipping' => '',
+    'Orders over $50' => '',
+    'Secure payment' => '',
+    'Multi-payment platform' => '',
+    'Need help ?' => '',
+    'Questions ? See or F.A.Q.' => '',
+    'Latest articles' => '',
+    'No articles currently' => '',
+    'Useful links' => '',
+    'Login' => '',
+    'Follow us' => '',
+    'Newsletter' => '',
+    'Sign up to receive our latest news.' => '',
+    'Email address' => '',
+    'Your email address' => '',
+    'Subscribe' => '',
+    'Contact Us' => '',
+    'Copyright' => '',
+    'You are here:' => '',
+    'Show' => '',
+    'per page' => '',
+    'Sort By' => '',
+    'Name ascending' => '',
+    'Name descending' => '',
+    'Price ascending' => '',
+    'Price descending' => '',
+    'View as' => '',
+    'View product' => '',
+    'Pagination' => '',
+    'No products available in this category' => '',
+    'Categories' => '',
+    'Ref.' => '',
+    'Availability' => '',
+    'In stock' => '',
+    'Out of stock' => '',
+    'Add to cart' => '',
+    'Description' => '',
+    'Additional Info' => '',
+    'View cart' => '',
+    'Continue Shopping' => '',
+    'Upsell Products' => '',
+    'Your Cart' => '',
+    'Billing and delivery' => '',
+    'Check my order' => '',
+    'Product Name' => '',
+    'Name' => '',
+    'Unit Price' => '',
+    'Price' => '',
+    'Quantity' => '',
+    'Qty' => '',
+    'Total' => '',
+    'Tax Inclusive' => '',
+    'TTC' => '',
+    'Available' => '',
+    'In Stock' => '',
+    'No.' => '',
+    'Remove' => '',
+    'Proceed checkout' => '',
+    'Warning' => '',
+    'missing or invalid data' => '',
+    'Do you have an account?' => '',
+    'Forgot your Password?' => '',
+    'Next' => '',
+    'Log out!' => '',
+    'My Account' => '',
+    'Previous product' => '',
+    'Next product' => '',
+    'instead of' => '',
+    'Add a new address' => '',
+    'Choose your delivery address' => '',
+    'Address %nb' => '',
+    'Edit this address' => '',
+    'Edit' => '',
+    'Remove this address' => '',
+    'Cancel' => '',
+    'Choose your delivery method' => '',
+    'Back' => '',
+    'Next Step' => '',
+    'Delete address' => '',
+    'Do you really want to delete this address ?' => '',
+    'No' => '',
+    'Yes' => '',
+    'Shipping Tax' => '',
+    'You may have a coupon ?' => '',
+    'Code :' => '',
+    'Coupon code' => '',
+    'Ok' => '',
+    'Delivery address' => '',
+    'Billing address' => '',
+    'Change address' => '',
+    'Choose your payment method' => '',
+    'Secure Payment' => '',
+    'You choose to pay by' => '',
+    'Thank you for the trust you place in us.' => '',
+    'A summary of your order email has been sent to the following address' => '',
+    'Your order will be confirmed by us upon receipt of your payment.' => '',
+    'Order number' => '',
+    'Date' => '',
+    'Go home' => '',
+    'Account' => '',
+    'Personal Information' => '',
+    'Change my account information' => '',
+    'Change my password' => '',
+    'My Address book' => '',
+    'My Address Books' => '',
+    'My Orders' => '',
+    'List of orders' => '',
+    'Order Number' => '',
+    'Amount' => '',
+    'Status' => '',
+    'View' => '',
+    'View order %ref as pdf document' => '',
+    'Order details' => '',
+    'You don\'t have orders yet.' => '',
+    'Update Profile' => '',
+    'Personal Informations' => '',
+    'Select Title' => '',
+    'Update' => '',
+    'Change Password' => '',
+    'Login Information' => '',
+    'Create New Address' => '',
+    'Address' => '',
+    'Home address' => '',
+    'Complementary address' => '',
+    'Select Country' => '',
+    'Create' => '',
+    'Related' => '',
+    'Grid' => '',
+    'List' => '',
+    'Next' => '',
+    'Previous' => '',
+    '%nb Items' => '',
+    '%nb Item' => '',
+    'Latest products' => '',
+    'Product Offers' => '',
+    /*
+    'The page cannot be found' => '',
+    'What\'s your name?' => '',
+    'So I can get back to you.' => '',
+    'The subject of your message.' => '',
+    'And your message...' => '',
+    'This email already exists.' => '',
+    'Address label' => '',
+    'Title' => '',
+    'First Name' => '',
+    'Last Name' => '',
+    'Company Name' => '',
+    'Street Address' => '',
+    'Address Line 2' => '',
+    'Address Line 3' => '',
+    'City' => '',
+    'Zip code' => '',
+    'Country' => '',
+    'Phone' => '',
+    'Cellphone' => '',
+    'Make this address as my primary address' => '',
+    'Full Name' => '',
+    'Your Email Address' => '',
+    'Subject' => '',
+    'Your Message' => '',
+    'Please enter your email address' => '',
+    'No, I am a new customer.' => '',
+    'Yes, I have a password :' => '',
+    'Please enter your password' => '',
+    'This value should not be blank.' => '',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
+    'This email does not exists' => '',
+    'Current Password' => '',
+    'New Password' => '',
+    'Password confirmation' => '',
+    'Your current password does not match.' => '',
+    'Password confirmation is not the same as password field.' => '',
+    'I would like to receive the newsletter or the latest news.' => '',
+    */
+    // Product Empty
+    'Product Empty Title' => 'Welcome',
+    'Product Empty Message' => 'It\'s really quick to add a product.
+      <ol>
+          <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+          <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+      </ol>',
+    'Product Empty Button' => 'Add my first product',
+    'Demo product title' => 'Demo product title',
+    'Demo product description' => 'Demo product description',
+    // Placeholder
+    'Placeholder firstname' => '',
+    'Placeholder lastname' => '',
+    'Placeholder email' => '',
+    'Placeholder phone' => '',
+    'Placeholder cellphone' => '',
+    'Placeholder company' => '',
+    'Placeholder address1' => '',
+    'Placeholder address2' => '',
+    'Placeholder city' => '',
+    'Placeholder zipcode' => '',
+    'Placeholder address label' => '',
+    'Placeholder contact name' => '',
+    'Placeholder contact email' => '',
+    'Placeholder contact subject' => '',
+    'Placeholder contact message' => '',
 )
 ;
\ No newline at end of file
diff --git a/templates/default/assets/less/thelia/buttons.less b/templates/default/assets/less/thelia/buttons.less
index 209426efe..6f328162c 100644
--- a/templates/default/assets/less/thelia/buttons.less
+++ b/templates/default/assets/less/thelia/buttons.less
@@ -46,6 +46,7 @@
     &.btn-coupon,
     &.btn-filter,
     &.btn-grid,
+    &.btn-jumbotron,
     &.btn-list,
     &.btn-login-mini,
     &.btn-search,
diff --git a/templates/default/category.html b/templates/default/category.html
index b47abd222..c47708ced 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -19,7 +19,8 @@
         {$product_order={$smarty.get.order|default:'alpha'}}
         <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
             {ifloop rel="product_list"}
-                {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
+                {assign var="amount" value="{count type="product" category={category attr="id"}}"}
+                {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
                 <div id="category-products">
                     <div class="products-content">
                         <ul class="product-col-4">
@@ -29,7 +30,7 @@
                         </ul>
                     </div>
                 </div><!-- /#category-products -->
-                {include file="includes/toolbar.html" toolbar="bottom"}
+                {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}}
             {/ifloop}
             {elseloop rel="product_list"}
                 <div class="address-warning">
diff --git a/templates/default/includes/product-empty.html b/templates/default/includes/product-empty.html
new file mode 100644
index 000000000..029d3b6cd
--- /dev/null
+++ b/templates/default/includes/product-empty.html
@@ -0,0 +1,35 @@
+<div class="jumbotron">
+    <h1>{intl l="Product Empty Title"}</h1>
+    <p>{intl l="Product Empty Message"}</p>
+    <p><a href="{url path="/admin"}" class="btn btn-jumbotron btn-lg" role="button">{intl l="Product Empty Button"}</a></p>
+</div>
+
+<section id="products-new">
+    <div class="products-heading">
+        <h2>{intl l="Latest"}</h2>
+    </div>
+
+    <div class="products-content">
+        <ul class="products-grid product-col-4">
+            {for $count=1 to 4}
+            <li class="item">
+                <article>
+                    <a href="{url path="/admin"}" tabindex="-1" class="product-image">
+                        {images file='../assets/img/280x196.png'}<img src="{$asset_url}" alt="{intl l="Demo product title"}">{/images}
+                        <span class="mask"></span>
+                    </a>
+                    <a href="{url path="/admin"}" class="product-info">
+                        <h3 class="name">{intl l="Demo product title"}</h3>
+                        <div class="short-description">{intl l="Demo product description"}</div>
+                        <div class="product-price">
+                            <div class="price-container">
+                               <span class="regular-price"><span class="price">99.99 {currency attr="symbol"}</span></span>
+                            </div>
+                        </div>
+                    </a>
+                </article><!-- /product -->
+            </li>
+            {/for}
+        </ul>
+    </div>
+</section><!-- #products-new -->
\ No newline at end of file
diff --git a/templates/default/includes/single-product.html b/templates/default/includes/single-product.html
index dd4137a69..9bb9efc89 100644
--- a/templates/default/includes/single-product.html
+++ b/templates/default/includes/single-product.html
@@ -1,5 +1,7 @@
 <li class="item">
     {assign var="hasSubmit" value = false}
+    {assign var="productTitle" value="{$TITLE}"}
+
     <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"}
@@ -15,14 +17,16 @@
 
         <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}">
+                <img itemprop="image" src="{$IMAGE_URL}" alt="{$productTitle}">
             {/loop}
-
+            {elseloop rel="product_thumbnail"}
+                {images file='../assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="{$productTitle}">{/images}
+            {/elseloop}
             <span class="mask"></span>
         </a>
 
         <div class="product-info">
-            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
+            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$productTitle}</span></a></h3>
             {if $hasDescription}
             <div class="description" itemprop="description">
                 <p>{$DESCRIPTION}</p>
diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html
index c512ba90a..ff8b0d69b 100644
--- a/templates/default/includes/toolbar.html
+++ b/templates/default/includes/toolbar.html
@@ -1,7 +1,7 @@
 <div class="toolbar toolbar-{$toolbar}" role="toolbar">
     {if $toolbar == "top" }
     <div class="sorter-container">
-        {*<span class="amount">9 {intl l="Item(s)"}</span>*}
+        <span class="amount">{if ($amount > 1)}{intl l="%nb Items" nb="{$amount}"}{else}{intl l="%nb Item" nb="{$amount}"}{/if}</span>
 
             <span class="limiter">
                 <label for="limit-top">{intl l="Show"}</label>
@@ -37,31 +37,33 @@
 
     </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 $amount > $limit}
+        <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} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
-            {else}
-                <li><a href="#" title="{intl l="Previous"}" 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} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
+                {if $product_page > 1}
+                    <li><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
                 {else}
-                    <li><a href="#" title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
+                    <li><a href="#" title="{intl l="Previous"}" 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} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
+                    {else}
+                        <li><a href="#" title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
+                    {/if}
 
-            {/if}
-            {/pageloop}
-        </ul>
-    </div>
+                {/if}
+                {/pageloop}
+            </ul>
+        </div>
+        {/if}
     {/if}
 </div><!-- /.toolbar toolbar-<?php echo $toolbar; ?> -->
diff --git a/templates/default/index.html b/templates/default/index.html
index 292aa238a..fabd8a3d9 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -14,101 +14,108 @@
                     <figure class="item active">
                         {images file='assets/img/carousel/slider1.png'}<img src="{$asset_url}" alt="img1">{/images}
                     </figure>
- {*                   <figure class="item">
+                    <figure class="item">
                         {images file='assets/img/carousel/slider2.png'}<img src="{$asset_url}" alt="img2">{/images}
                     </figure>
                     <figure class="item">
                         {images file='assets/img/carousel/slider3.png'}<img src="{$asset_url}" alt="img3">{/images}
-                    </figure>*}
+                    </figure>
                 </div>
             </div>
-{*            <a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a>
-            <a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a>*}
+            <a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a>
+            <a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a>
         </div>
     </section><!-- #carousel -->
 
+    {if {count type="product"} eq 0}
+        {include file="includes/product-empty.html"}
+    {else}
+        {ifloop rel="product_new"}
+        <section id="products-new">
+            <div class="products-heading">
+                <h2>{intl l="Latest"} <a href="{url path="/view_all"  type="new"}" class="btn-all">{intl l="+ View All"}</a></h2>
+            </div>
 
-    <section id="products-new">
-        <div class="products-heading">
-            <h2>{intl l="Latest"} <a href="{url path="/view_all"  type="new"}" class="btn-all">{intl l="+ View All"}</a></h2>
-        </div>
-
-        <div class="products-content">
-            <ul class="products-grid product-col-4">
-                {loop name="product_new" type="product" limit="4" new="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 -->
-                        {$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}">
+            <div class="products-content">
+                <ul class="products-grid product-col-4">
+                    {loop name="product_new" type="product" limit="4" new="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 -->
+                            {$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}
-                        {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 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}
-                        {/loop}
 
-                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-                            {ifloop rel="image_product_new" }
-                                <img itemprop="image"
-                            {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="true" width="280" height="196" resize_mode="borders"}
-                                src="{$IMAGE_URL}"
-                            {/loop}
-                                alt="Product #{$LOOP_COUNT}" >
-                            {/ifloop}
-                            {elseloop rel="image_product_new"}
-                                {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
-                            {/elseloop}
-                            <span class="mask"></span>
-                        </a>
+                            <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
+                                {ifloop rel="image_product_new" }
+                                    <img itemprop="image"
+                                {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="true" width="280" height="196" resize_mode="borders"}
+                                    src="{$IMAGE_URL}"
+                                {/loop}
+                                    alt="Product #{$LOOP_COUNT}" >
+                                {/ifloop}
+                                {elseloop rel="image_product_new"}
+                                    {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
+                                {/elseloop}
+                                <span class="mask"></span>
+                            </a>
 
-                        <a href="{$URL}" class="product-info">
-                            <h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
-                            <div class="short-description" itemprop="description">{$CHAPO}</div>
+                            <a href="{$URL}" class="product-info">
+                                <h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
+                                <div class="short-description" itemprop="description">{$CHAPO}</div>
 
-                            <div class="product-price">
-                                <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                    {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" />
+                                <div class="product-price">
+                                    <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+                                        {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" />
 
-                                    <!-- 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
-                                    -->
-                                    <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                        <!-- 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
+                                        -->
+                                        <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                    </div>
                                 </div>
-                            </div>
-                        </a>
-                    </article><!-- /product -->
-                </li>
-                {/loop}
+                            </a>
+                        </article><!-- /product -->
+                    </li>
+                    {/loop}
+                </ul>
+            </div>
+        </section><!-- #products-new -->
+        {/ifloop}
 
-            </ul>
-        </div>
-    </section><!-- #products-new -->
+        {ifloop rel="product_promo"}
+        <section id="products-offer">
+            <div class="products-heading">
+                <h2>{intl l="Offers"} <a href="{url path="/view_all" type="offers"}" class="btn-all">{intl l="+ View All"}</a></h2>
+            </div>
 
-    <section id="products-offer">
-        <div class="products-heading">
-            <h2>{intl l="Offers"} <a href="{url path="/view_all" type="offers"}" class="btn-all">{intl l="+ View All"}</a></h2>
-        </div>
+            <div class="products-content">
+                <ul class="products-grid product-col-5 hover-effect">
+                    {loop name="product_promo" type="product" limit="5" promo="yes"}
+                        {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"}
+                    {/loop}
+                </ul>
+            </div>
+        </section><!-- #products-offer -->
+        {/ifloop}
+    {/if}
 
-        <div class="products-content">
-            <ul class="products-grid product-col-5 hover-effect">
-                {loop name="product_promo" type="product" limit="5" promo="yes"}
-                    {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"}
-                {/loop}
 
-            </ul>
-        </div>
-    </section><!-- #products-offer -->
 {/block}
\ No newline at end of file
diff --git a/templates/default/product.html b/templates/default/product.html
index 8fd63bc06..3fa011d97 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -33,12 +33,15 @@
             {/loop}
 
             <section id="product-gallery">
+                {ifloop rel="image.main"}
                 <figure class="product-image">
                     {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1"}
                         <img src="{$IMAGE_URL}" alt="{$TITLE}" class="img-responsive" itemprop="image" data-toggle="magnify">
                     {/loop}
                 </figure>
+                {/ifloop}
 
+                {ifloop rel="image.carousel"}
                 <div id="product-thumbnails" class="slide" style="position:relative;">
                     <div class="carousel-inner">
                         <div class="item active">
@@ -76,16 +79,17 @@
                         <a class="right carousel-control" href="#product-thumbnails" data-slide="next"><i class="icon-next"></i></a>
                     {/ifloop}
                 </div>
+                {/ifloop}
             </section>
 
             <section id="product-details">
                 <div class="product-info">
                     <h1 class="name"><span itemprop="name">{$TITLE}</span></h1>
-                    <span itemprop="sku" class="sku">{intl l='Ref.'}: {$REF}</span>
+                    {if $REF}<span itemprop="sku" class="sku">{intl l='Ref.'}: {$REF}</span>{/if}
 
-                    <div class="short-description">
+                    {if $POSTSCRIPTUM}<div class="short-description">
                         <p>{$POSTSCRIPTUM}</p>
-                    </div>
+                    </div>{/if}
                 </div>
 
                 {loop name="stock_meta" type="product_sale_elements" product="$ID"}
@@ -111,7 +115,6 @@
                         <span class="availibity-label">{intl l="Availability"}: </span>
                         <span itemprop="availability" href="{$current_stock_href}" class="{$current_stock_class}" id="stockInformations">
                             <span class="in">{intl l='In stock'}</span><span class="out">{intl l='Out of stock'}</span>
-
                         </span>
                     </div>
 
@@ -142,10 +145,8 @@
                         <input type="hidden" name="{$name}" value="1">
                     {/form_field}
 
-
                     {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
-
                     {form_field form=$form field="product"}
                         <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$ID}" {$attr} >
                     {/form_field}
@@ -172,12 +173,12 @@
                         {form_field form=$form field='quantity'}
                         <div class="form-group group-qty {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
                             <label for="{$label_attr.for}">{$label}</label>
-                                <input type="number" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value|default:1}" min="1" required>
-                                {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
-                                {/if}
+                            <input type="number" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value|default:1}" min="1" required>
+                            {if $error }
+                                <span class="help-block">{$message}</span>
+                            {elseif $value != "" && !$error}
+                                <span class="help-block"><i class="icon-ok"></i></span>
+                            {/if}
                         </div>
                         {/form_field}
 
@@ -189,29 +190,38 @@
                 {/form}
             </section>
 
-            <section id="product-tabs">
-                <ul class="nav nav-tabs" role="tablist">
-                    <li class="active" role="presentation"><a id="tab1" href="#description" data-toggle="tab" role="tab">{intl l="Description"}</a></li>
-                    <li role="presentation"><a id="tab2" href="#additional" data-toggle="tab" role="tab">{intl l="Additional Info"}</a></li>
-                </ul>
-                <div class="tab-content">
-                    <div class="tab-pane active in" id="description" itemprop="description" role="tabpanel" aria-labelledby="tab1">
-                        <p>{$DESCRIPTION}</p>
-                    </div>
-                    <div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">
-                        {ifloop rel="feature_value_info"}
-                        <ul>
+            {strip}
+            {capture "additional"}
+                {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}
+                                {$TITLE}
                                 {/loop}
                             </li>
                         {/loop}
-                        </ul>
-                        {/ifloop}
+                    </ul>
+                {/ifloop}
+            {/capture}
+            {/strip}
+
+            <section id="product-tabs">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li class="active" role="presentation"><a id="tab1" href="#description" data-toggle="tab" role="tab">{intl l="Description"}</a></li>
+                    {if $smarty.capture.additional ne ""}<li role="presentation"><a id="tab2" href="#additional" data-toggle="tab" role="tab">{intl l="Additional Info"}</a></li>{/if}
+
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane active in" id="description" itemprop="description" role="tabpanel" aria-labelledby="tab1">
+                        <p>{$DESCRIPTION|default:'N/A'}</p>
                     </div>
+                    {if $smarty.capture.additional ne ""}
+                    <div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">
+                        {$smarty.capture.additional}
+                    </div>
+                    {/if}
                 </div>
             </section>
         </article><!-- /product -->
diff --git a/templates/default/search.html b/templates/default/search.html
index 7c8e212b4..2151ace21 100644
--- a/templates/default/search.html
+++ b/templates/default/search.html
@@ -20,14 +20,14 @@
     <article class="col-main  {$smarty.get.mode|default:"grid"}"  role="main" aria-labelledby="main-label">
 
         <h1 id="main-label" class="page-header">{intl l="Search Result for"} <small>{$smarty.get.q}</small></h1>
-        {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
+        {assign var="amount" value="{count type="product" title="{$smarty.get.q}"}"}
+        {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
         <div id="category-products">
             <div class="products-content">
                 {ifloop rel="product_list"}
                     <ul class="product-col-3">
                         {loop type="product" name="product_list" title="{$smarty.get.q}"  limit=$limit page=$product_page order=$product_order}
                             {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="369" height="247"}
-                            {assign "products_count" $LOOP_TOTAL}
                         {/loop}
                     </ul>
                 {/ifloop}
@@ -37,7 +37,7 @@
             </div>
         </div><!-- /#category-products -->
         {ifloop rel="product_list"}
-            {include file="includes/toolbar.html" toolbar="bottom"}
+            {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}}
         {/ifloop}
     </article>
 
diff --git a/templates/default/view_all.html b/templates/default/view_all.html
index cd3650151..6e2c709bc 100644
--- a/templates/default/view_all.html
+++ b/templates/default/view_all.html
@@ -13,43 +13,34 @@
 {block name="main-content"}
     <div class="main">
 
+    {* Parameters *}
     {$limit={$smarty.get.limit|default:8}}
     {$product_page={$smarty.get.page|default:1}}
-    {$product_order={$smarty.get.order|default:'alpha'}}
+    {$product_order={$smarty.get.order|default:'new'}}
+    {$product_type={$smarty.get.type|default:'new'}}
 
-<article class="col-main  {$smarty.get.mode|default:"grid"}"  role="main" aria-labelledby="main-label">
+    <article class="col-main  {$smarty.get.mode|default:"grid"}"  role="main" aria-labelledby="main-label">
 
-    {if $smarty.get.type == "new"}
-        <h1 id="main-label" class="page-header">{intl l="View all"} {$smarty.get.type} {intl l="products"}</h1>
-        {else}
-        <h1 id="main-label" class="page-header">{intl l="View all"} {intl l="offers"}</h1>
-    {/if}
-    {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
-    <div id="category-products">
-        <div class="products-content">
-            {ifloop rel="product_list"}
-                <ul class="product-col-3">
-                    {if $smarty.get.type == "new"}
-                        {loop type="product" name="product_list" limit=$limit page=$product_page order=$product_order}
+        <h1 id="main-label" class="page-header">{if $product_type == "new"}{intl l="Latest products"}{elseif $product_type == "offers"}{intl l="Product Offers"}{/if}</h1>
+        {assign var="amount" value="{count type="product" promo="{$product_type == "offers"}" new="{$product_type == "new"}"}"}
+        {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order  amount={$amount}}
+        <div id="category-products">
+            <div class="products-content">
+                {ifloop rel="product_list"}
+                    <ul class="product-col-3">
+                        {loop type="product" promo="{$product_type == "offers"}" new="{$product_type == "new"}" name="product_list" limit=$limit page=$product_page order=$product_order}
                             {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="700" height="320"}
                         {/loop}
-                        {else}
-                        {loop type="product" name="product_list"  promo="yes" limit=$limit page=$product_page order=$product_order}
-                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="700" height="320"}
-                        {/loop}
-                    {/if}
-
-
-                </ul>
-            {/ifloop}
-            {elseloop  rel="product_list"}
-                <h2 class="text-center">{intl l="No results found"} </h2>
-            {/elseloop}
-        </div>
-    </div><!-- /#category-products -->
-    {ifloop rel="product_list"}
-        {include file="includes/toolbar.html" toolbar="bottom"}
-    {/ifloop}
+                    </ul>
+                {/ifloop}
+                {elseloop  rel="product_list"}
+                    <h2 class="text-center">{intl l="No results found"} </h2>
+                {/elseloop}
+            </div>
+        </div><!-- /#category-products -->
+        {ifloop rel="product_list"}
+            {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}}
+        {/ifloop}
     </article>
 
 </div><!-- /.layout -->