diff --git a/themes/default-bootstrap/manufacturer-list.tpl b/themes/default-bootstrap/manufacturer-list.tpl
index 240940682..c41f5b3af 100644
--- a/themes/default-bootstrap/manufacturer-list.tpl
+++ b/themes/default-bootstrap/manufacturer-list.tpl
@@ -43,70 +43,109 @@
 {if isset($errors) AND $errors}
 	{include file="$tpl_dir./errors.tpl"}
 {else}
-
 	{if $nbManufacturers > 0}
     	<div class="content_sortPagiBar">
         	<div class="sortPagiBar clearfix">
             	<ul class="display hidden-xs">
-                    <li class="display-title">{l s='View:'}</li>
-                    <li id="grid"><a onclick="display('grid');"><i class="icon-th-large"></i>{l s='Grid'}</a></li>
-                    <li id="list"><a onclick="display('list');"><i class="icon-th-list"></i>{l s='List'}</a></li>
+                    <li class="display-title">
+                    	{l s='View:'}
+                    </li>
+                    <li id="grid">
+                    	<a onclick="display('grid');">
+                    		<i class="icon-th-large"></i>{l s='Grid'}
+                    	</a>
+                    </li>
+                    <li id="list">
+                    	<a onclick="display('list');">
+                    		<i class="icon-th-list"></i>{l s='List'}
+                    	</a>
+                    </li>
                 </ul>
                 {include file="./nbr-product-page.tpl"}
             </div>
         	<div class="top-pagination-content clearfix bottom-line">
 				{include file="$tpl_dir./pagination.tpl"}
             </div>
-        </div>
+        </div> <!-- .content_sortPagiBar --> 
+
         {assign var='nbItemsPerLine' value=3}
         {assign var='nbItemsPerLineTablet' value=2}
         {assign var='nbLi' value=$manufacturers|@count}
         {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
         {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
+
 		<ul id="manufacturers_list">
-		{foreach from=$manufacturers item=manufacturer name=manufacturers}
-        	{math equation="(total%perLine)" total=$smarty.foreach.manufacturers.total perLine=$nbItemsPerLine assign=totModulo}
-            {math equation="(total%perLineT)" total=$smarty.foreach.manufacturers.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
-            {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
-            {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
-			<li class="{if $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModulo)}last-line{/if} {if $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModuloTablet)}last-tablet-line{/if}{if $smarty.foreach.manufacturers.last} item-last{/if}"> 
-            	<div class="left-side">
-					<!-- logo -->
-					<div class="logo">
-						{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}" title="{$manufacturer.name|escape:'html':'UTF-8'}" class="lnk_img">{/if}
-						<img src="{$img_manu_dir}{$manufacturer.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" />
-						{if $manufacturer.nb_products > 0}</a>{/if}
-					</div>
-				</div>
-				<div class="middle-side">
-                	<!-- name -->
-					<h3>
-						{if $manufacturer.nb_products > 0}<a class="product-name" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{/if}
-							{$manufacturer.name|truncate:60:'...'|escape:'html':'UTF-8'}
-						{if $manufacturer.nb_products > 0}</a>{/if}
-					</h3>
-					<div class="description rte">
-						{$manufacturer.short_description}
-					</div>
-                </div>
-				<div class="right-side">
-                	<div class="right-side-content">
-                        <p class="product-counter">
-                            {if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{/if}
-                            {if $manufacturer.nb_products == 1}{l s='%d product' sprintf=$manufacturer.nb_products|intval}{else}{l s='%d products' sprintf=$manufacturer.nb_products|intval}{/if}
-                            {if $manufacturer.nb_products > 0}</a>{/if}
-                        </p>
-                    {if $manufacturer.nb_products > 0}
-                        <a class="btn btn-default button exclusive-medium" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='view products'} <i class="icon-chevron-right right"></i></span></a>
-                    {/if}
-                    </div>
-                </div>
-			</li>
-		{/foreach}
+			{foreach from=$manufacturers item=manufacturer name=manufacturers}
+	        	{math equation="(total%perLine)" total=$smarty.foreach.manufacturers.total perLine=$nbItemsPerLine assign=totModulo}
+	            {math equation="(total%perLineT)" total=$smarty.foreach.manufacturers.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
+	            {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
+	            {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
+				<li class="{if $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModulo)}last-line{/if} {if $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModuloTablet)}last-tablet-line{/if}{if $smarty.foreach.manufacturers.last} item-last{/if}"> 
+	            	<div class="left-side">
+						<div class="logo">
+							{if $manufacturer.nb_products > 0}
+								<a
+								class="lnk_img" 
+								href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}" 
+								title="{$manufacturer.name|escape:'html':'UTF-8'}" >
+							{/if}
+								<img src="{$img_manu_dir}{$manufacturer.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" />
+							{if $manufacturer.nb_products > 0}
+								</a>
+							{/if}
+						</div> <!-- .logo -->
+					</div> <!-- .left-side -->
+					
+					<div class="middle-side">
+						<h3>
+							{if $manufacturer.nb_products > 0}
+								<a 
+								class="product-name" 
+								href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">
+							{/if}
+								{$manufacturer.name|truncate:60:'...'|escape:'html':'UTF-8'}
+							{if $manufacturer.nb_products > 0}
+								</a>
+							{/if}
+						</h3>
+						<div class="description rte">
+							{$manufacturer.short_description}
+						</div>
+	                </div> <!-- .middle-side -->
+
+					<div class="right-side">
+	                	<div class="right-side-content">
+	                        <p class="product-counter">
+	                            {if $manufacturer.nb_products > 0}
+	                            	<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">
+	                            {/if}
+	                            {if $manufacturer.nb_products == 1}
+	                            	{l s='%d product' sprintf=$manufacturer.nb_products|intval}
+	                            {else}
+	                            	{l s='%d products' sprintf=$manufacturer.nb_products|intval}
+	                            {/if}
+	                            {if $manufacturer.nb_products > 0}
+	                        		</a>
+	                        	{/if}
+	                        </p>
+		                    {if $manufacturer.nb_products > 0}
+		                        <a 
+		                        class="btn btn-default button exclusive-medium" 
+		                        href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">
+		                        	<span>
+		                        		{l s='view products'} <i class="icon-chevron-right right"></i>
+		                        	</span>
+		                        </a>
+		                    {/if}
+	                    </div>
+	                </div> <!-- .right-side -->
+
+				</li>
+			{/foreach}
 		</ul>
         <div class="content_sortPagiBar">
         	<div class="bottom-pagination-content clearfix">
-				{include file="$tpl_dir./pagination.tpl"}
+				{include file="$tpl_dir./pagination.tpl" paginationId='bottom'}
             </div>
         </div>
         <script type="text/javascript"><!--
diff --git a/themes/default-bootstrap/manufacturer.tpl b/themes/default-bootstrap/manufacturer.tpl
index eaa213c74..bdf4bf896 100644
--- a/themes/default-bootstrap/manufacturer.tpl
+++ b/themes/default-bootstrap/manufacturer.tpl
@@ -27,40 +27,50 @@
 {include file="$tpl_dir./errors.tpl"}
 
 {if !isset($errors) OR !sizeof($errors)}
-	<h1 class="page-heading product-listing">{l s='List of products by manufacturer'}&nbsp;{$manufacturer->name|escape:'html':'UTF-8'}</h1>
+	<h1 class="page-heading product-listing">
+		{l s='List of products by manufacturer'}&nbsp;{$manufacturer->name|escape:'html':'UTF-8'}
+	</h1>
 	{if !empty($manufacturer->description) || !empty($manufacturer->short_description)}
 		<div class="description_box">
 			{if !empty($manufacturer->short_description)}
-				<div class="short_desc">{$manufacturer->short_description}</div>
-				<div class="hide_desc">{$manufacturer->description}</div>
-				<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide();$(this).prev().prev().hide(); return false;">{l s='More'}</a>
+				<div class="short_desc">
+					{$manufacturer->short_description}
+				</div>
+				<div class="hide_desc">
+					{$manufacturer->description}
+				</div>
+				<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide();$(this).prev().prev().hide(); return false;">
+					{l s='More'}
+				</a>
 			{else}
-				<div>{$manufacturer->description}</div>
+				<div>
+					{$manufacturer->description}
+				</div>
 			{/if}
 		</div>
 	{/if}
 
 	{if $products}
-	<div class="content_sortPagiBar">
-    	<div class="sortPagiBar clearfix">
-			{include file="./product-sort.tpl"}
-			{include file="./nbr-product-page.tpl"}
+		<div class="content_sortPagiBar">
+	    	<div class="sortPagiBar clearfix">
+				{include file="./product-sort.tpl"}
+				{include file="./nbr-product-page.tpl"}
+			</div>
+	    	<div class="top-pagination-content clearfix">
+	        	{include file="./product-compare.tpl"}
+	            {include file="$tpl_dir./pagination.tpl"}
+	        </div>
 		</div>
-    	<div class="top-pagination-content clearfix">
-        	{include file="./product-compare.tpl"}
-            {include file="$tpl_dir./pagination.tpl"}
-        </div>
-	</div>
 
-	{include file="./product-list.tpl" products=$products}
+		{include file="./product-list.tpl" products=$products}
 
-	<div class="content_sortPagiBar">
-        <div class="bottom-pagination-content clearfix">
-        	{include file="./product-compare.tpl"}
-			{include file="./pagination.tpl" paginationId='bottom'}
-        </div>
-	</div>
+		<div class="content_sortPagiBar">
+	        <div class="bottom-pagination-content clearfix">
+	        	{include file="./product-compare.tpl"}
+				{include file="./pagination.tpl" paginationId='bottom'}
+	        </div>
+		</div>
 	{else}
-	<p class="alert alert-warning">{l s='No products for this manufacturer.'}</p>
+		<p class="alert alert-warning">{l s='No products for this manufacturer.'}</p>
 	{/if} 
 {/if}
diff --git a/themes/default-bootstrap/pagination.tpl b/themes/default-bootstrap/pagination.tpl
index 8ab492c5e..7e7e31ea0 100644
--- a/themes/default-bootstrap/pagination.tpl
+++ b/themes/default-bootstrap/pagination.tpl
@@ -49,68 +49,141 @@
 	{/if}
 	<!-- Pagination -->
 	<div id="pagination{if isset($paginationId)}_{$paginationId}{/if}" class="pagination clearfix">
-    {if $nb_products > $products_per_page && $start!=$stop}
-		<form action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}" method="get" class="showall">
-			<div>
-				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />{/if}
-				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />{/if}
-                <button type="submit" class="btn btn-default button exclusive-medium"><span>{l s='Show all'}</span></button>
-				{if is_array($requestNb)}
-					{foreach from=$requestNb item=requestValue key=requestKey}
-						{if $requestKey != 'requestUrl'}
-							<input type="hidden" name="{$requestKey|escape:'html':'UTF-8'}" value="{$requestValue|escape:'html':'UTF-8'}" />
-						{/if}
-					{/foreach}
+	    {if $nb_products > $products_per_page && $start!=$stop}
+			<form
+			class="showall" 
+			action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}" 
+			method="get">
+				<div>
+					{if isset($search_query) AND $search_query}
+						<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />
+					{/if}
+					{if isset($tag) AND $tag AND !is_array($tag)}
+						<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />
+					{/if}
+	                <button type="submit" class="btn btn-default button exclusive-medium">
+	                	<span>{l s='Show all'}</span>
+	                </button>
+					{if is_array($requestNb)}
+						{foreach from=$requestNb item=requestValue key=requestKey}
+							{if $requestKey != 'requestUrl'}
+								<input type="hidden" name="{$requestKey|escape:'html':'UTF-8'}" value="{$requestValue|escape:'html':'UTF-8'}" />
+							{/if}
+						{/foreach}
+					{/if}
+	                <input name="n" id="nb_item" class="hidden" value="{$nb_products}" />
+				</div>
+			</form>
+		{/if}
+		{if $start!=$stop}
+			<ul class="pagination">
+				{if $p != 1}
+					{assign var='p_previous' value=$p-1}
+					<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_previous">
+						<a {$no_follow_text} href="{$link->goPage($requestPage, $p_previous)|escape:'html':'UTF-8'}">
+							<i class="icon-chevron-left"></i> <b>{l s='Previous'}</b>
+						</a>
+					</li>
+				{else}
+					<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_previous">
+						<span>
+							<i class="icon-chevron-left"></i> <b>{l s='Previous'}</b>
+						</span>
+					</li>
 				{/if}
-                <input name="n" id="nb_item" class="hidden" value="{$nb_products}" />
-			</div>
-		</form>
-	{/if}
-	{if $start!=$stop}
-		<ul class="pagination">
-		{if $p != 1}
-			{assign var='p_previous' value=$p-1}
-			<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_previous"><a {$no_follow_text} href="{$link->goPage($requestPage, $p_previous)}"><i class="icon-chevron-left"></i> <b>{l s='Previous'}</b></a></li>
-		{else}
-			<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_previous"><span><i class="icon-chevron-left"></i> <b>{l s='Previous'}</b></span></li>
+				{if $start==3}
+					<li>
+						<a {$no_follow_text}  href="{$link->goPage($requestPage, 1)|escape:'html':'UTF-8'}">
+							<span>1</span>
+						</a>
+					</li>
+					<li>
+						<a {$no_follow_text}  href="{$link->goPage($requestPage, 2)|escape:'html':'UTF-8'}">
+							<span>2</span>
+						</a>
+					</li>
+				{/if}
+				{if $start==2}
+					<li>
+						<a {$no_follow_text}  href="{$link->goPage($requestPage, 1)|escape:'html':'UTF-8'}">
+							<span>1</span>
+						</a>
+					</li>
+				{/if}
+				{if $start>3}
+					<li>
+						<a {$no_follow_text}  href="{$link->goPage($requestPage, 1|escape:'html':'UTF-8')}">
+							<span>1</span>
+						</a>
+					</li>
+					<li class="truncate">
+						<span>
+							<span>...</span>
+						</span>
+					</li>
+				{/if}
+				{section name=pagination start=$start loop=$stop+1 step=1}
+					{if $p == $smarty.section.pagination.index}
+						<li class="active current">
+							<span>
+								<span>{$p|escape:'html':'UTF-8'}</span>
+							</span>
+						</li>
+					{else}
+						<li>
+							<a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)|escape:'html':'UTF-8'}">
+								<span>{$smarty.section.pagination.index|escape:'html':'UTF-8'}</span>
+							</a>
+						</li>
+					{/if}
+				{/section}
+				{if $pages_nb>$stop+2}
+					<li class="truncate">
+						<span>
+							<span>...</span>
+						</span>
+					</li>
+					<li>
+						<a href="{$link->goPage($requestPage, $pages_nb)|escape:'html':'UTF-8'}">
+							<span>{$pages_nb|intval}</span>
+						</a>
+					</li>
+				{/if}
+				{if $pages_nb==$stop+1}
+					<li>
+						<a href="{$link->goPage($requestPage, $pages_nb)|escape:'html':'UTF-8'}">
+							<span>{$pages_nb|intval}</span>
+						</a>
+					</li>
+				{/if}
+				{if $pages_nb==$stop+2}
+					<li>
+						<a href="{$link->goPage($requestPage, $pages_nb-1)|escape:'html':'UTF-8'}">
+							<span>{$pages_nb-1|intval}</span>
+						</a>
+					</li>
+					<li>
+						<a href="{$link->goPage($requestPage, $pages_nb)|escape:'html':'UTF-8'}">
+							<span>{$pages_nb|intval}</span>
+						</a>
+					</li>
+				{/if}
+				{if $pages_nb > 1 AND $p != $pages_nb}
+					{assign var='p_next' value=$p+1}
+					<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_next">
+						<a {$no_follow_text} href="{$link->goPage($requestPage, $p_next)|escape:'html':'UTF-8'}">
+							<b>{l s='Next'}</b> <i class="icon-chevron-right"></i>
+						</a>
+					</li>
+				{else}
+					<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_next">
+						<span>
+							<b>{l s='Next'}</b> <i class="icon-chevron-right"></i>
+						</span>
+					</li>
+				{/if}
+			</ul>
 		{/if}
-		{if $start==3}
-			<li><a {$no_follow_text}  href="{$link->goPage($requestPage, 1)}"><span>1</span></a></li>
-			<li><a {$no_follow_text}  href="{$link->goPage($requestPage, 2)}"><span>2</span></a></li>
-		{/if}
-		{if $start==2}
-			<li><a {$no_follow_text}  href="{$link->goPage($requestPage, 1)}"><span>1</span></a></li>
-		{/if}
-		{if $start>3}
-			<li><a {$no_follow_text}  href="{$link->goPage($requestPage, 1)}"><span>1</span></a></li>
-			<li class="truncate"><span><span>...</span></span></li>
-		{/if}
-		{section name=pagination start=$start loop=$stop+1 step=1}
-			{if $p == $smarty.section.pagination.index}
-				<li class="active current"><span><span>{$p|escape:'html':'UTF-8'}</span></span></li>
-			{else}
-				<li><a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)}"><span>{$smarty.section.pagination.index|escape:'html':'UTF-8'}</span></a></li>
-			{/if}
-		{/section}
-		{if $pages_nb>$stop+2}
-			<li class="truncate"><span><span>...</span></span></li>
-			<li><a href="{$link->goPage($requestPage, $pages_nb)}"><span>{$pages_nb|intval}</span></a></li>
-		{/if}
-		{if $pages_nb==$stop+1}
-			<li><a href="{$link->goPage($requestPage, $pages_nb)}"><span>{$pages_nb|intval}</span></a></li>
-		{/if}
-		{if $pages_nb==$stop+2}
-			<li><a href="{$link->goPage($requestPage, $pages_nb-1)}"><span>{$pages_nb-1|intval}</span></a></li>
-			<li><a href="{$link->goPage($requestPage, $pages_nb)}"><span>{$pages_nb|intval}</span></a></li>
-		{/if}
-		{if $pages_nb > 1 AND $p != $pages_nb}
-			{assign var='p_next' value=$p+1}
-			<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_next"><a {$no_follow_text} href="{$link->goPage($requestPage, $p_next)}"><b>{l s='Next'}</b> <i class="icon-chevron-right"></i></a></li>
-		{else}
-			<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_next"><span><b>{l s='Next'}</b> <i class="icon-chevron-right"></i></span></li>
-		{/if}
-		</ul>
-	{/if}
 	</div>
     <div class="product-count">
     	{if ($n*$p) < $nb_products }
diff --git a/themes/default-bootstrap/product-compare.tpl b/themes/default-bootstrap/product-compare.tpl
index 664e63270..c5868bc51 100644
--- a/themes/default-bootstrap/product-compare.tpl
+++ b/themes/default-bootstrap/product-compare.tpl
@@ -37,7 +37,7 @@
 {/if}
 	<form method="post" action="{$link->getPageLink('products-comparison')|escape:htmlall:'UTF-8'}" onsubmit="true" class="compare-form">
 		<div>
-        <button type="submit" id="bt_compare{if isset($paginationId)}_{$paginationId}{/if}" class="btn btn-default button button-medium bt_compare"><span>{l s='Compare'} (<strong class="total-compare-val">{count($compared_products)}</strong>)<i class="icon-chevron-right right"></i></span></button>
+        <button type="submit" class="btn btn-default button button-medium bt_compare{if isset($paginationId)}_{$paginationId}{/if}"><span>{l s='Compare'} (<strong class="total-compare-val">{count($compared_products)}</strong>)<i class="icon-chevron-right right"></i></span></button>
          <input type="hidden" name="compare_product_count" class="compare_product_count" value="{count($compared_products)}" />
 		<input type="hidden" name="compare_product_list" class="compare_product_list" value="" />
 		</div>
diff --git a/themes/default-bootstrap/products-comparison.tpl b/themes/default-bootstrap/products-comparison.tpl
index a9680d821..4cf18d000 100644
--- a/themes/default-bootstrap/products-comparison.tpl
+++ b/themes/default-bootstrap/products-comparison.tpl
@@ -49,20 +49,37 @@
 					{assign var='replace_id' value=$product->id|cat:'|'}
 					<td class="ajax_block_product comparison_infos product-block">
 						<div class="remove">
-							<a class="cmp_remove" href="{$link->getPageLink('products-comparison', true)|escape:'html'}" title="{l s='Remove'}" data-id-product="{$product->id}"><i class="icon-trash"></i></a>
+							<a 
+							class="cmp_remove" 
+							href="{$link->getPageLink('products-comparison', true)|escape:'html'}" 
+							title="{l s='Remove'}" 
+							data-id-product="{$product->id}">
+								<i class="icon-trash"></i>
+							</a>
 						</div>
 						<div class="product-image-block">
-							<a href="{$product->getLink()|escape:html:'UTF-8'}" title="{$product->name|escape:html:'UTF-8'}" class="product_image" >
-								<img class="img-responsive" src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home_default')|escape:'html'}" alt="{$product->name|escape:html:'UTF-8'}" />
+							<a
+							class="product_image" 
+							href="{$product->getLink()|escape:html:'UTF-8'}" 
+							title="{$product->name|escape:html:'UTF-8'}">
+								<img 
+								class="img-responsive" 
+								src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home_default')|escape:'html'}" 
+								alt="{$product->name|escape:html:'UTF-8'}" />
 							</a>
 							{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
 								{if $product->on_sale}
-									<div class="sale-box"><span class="sale-label">{l s='Sale!'}</span></div>
+									<div class="sale-box">
+										<span class="sale-label">{l s='Sale!'}</span>
+									</div>
 								{/if}
 							{/if}
 						</div> <!-- end product-image-block -->
 						<h5>
-							<a class="product-name" href="{$product->getLink()|escape:html:'UTF-8'}" title="{$product->name|truncate:32:'...'|escape:'html':'UTF-8'}">
+							<a 
+							class="product-name" 
+							href="{$product->getLink()|escape:html:'UTF-8'}" 
+							title="{$product->name|truncate:32:'...'|escape:'html':'UTF-8'}">
 								{$product->name|truncate:45:'...'|escape:'html':'UTF-8'}
 							</a>
 						</h5>
@@ -71,11 +88,19 @@
 								<span class="price product-price">{convertPrice price=$product->getPrice($taxes_behavior)}</span>
 								{if isset($product->specificPrice) && $product->specificPrice}
 									{if {$product->specificPrice.reduction_type == 'percentage'}}
-										<span class="old-price product-price">{displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)}</span>
-										<span class="price-percent-reduction">-{$product->specificPrice.reduction*100|floatval}%</span>
+										<span class="old-price product-price">
+											{displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)}
+										</span>
+										<span class="price-percent-reduction">
+											-{$product->specificPrice.reduction*100|floatval}%
+										</span>
 									{else}
-										<span class="old-price product-price">{convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)}</span>
-										<span class="price-percent-reduction">-{convertPrice price=$product->specificPrice.reduction}</span>
+										<span class="old-price product-price">
+											{convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)}
+										</span>
+										<span class="price-percent-reduction">
+											-{convertPrice price=$product->specificPrice.reduction}
+										</span>
 									{/if}
 								{/if}
 								{if $product->on_sale}
@@ -86,20 +111,23 @@
 									{/if}
 									{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
 										{math equation="pprice / punit_price"  pprice=$product->getPrice($taxes_behavior)  punit_price=$product->unit_price_ratio assign=unit_price}
-										<span class="comparison_unit_price">&nbsp;{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'}</span>
+										<span class="comparison_unit_price">
+											&nbsp;{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'}
+										</span>
 									{else}
 								{/if}
 							{/if}
 						</div> <!-- end prices-container -->
 
-						<div class="product_desc">{$product->description_short|strip_tags|truncate:60:'...'}</div>
+						<div class="product_desc">
+							{$product->description_short|strip_tags|truncate:60:'...'}
+						</div>
 						
 						<div class="comparison_product_infos">
-							<!-- availability -->
 							<p class="comparison_availability_statut">
 								{if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)}
-									<span id="availability_label">{l s='Availability:'}</span>
-									<span id="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
+									<span class="availability_label">{l s='Availability:'}</span>
+									<span class="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
 										{if $product->quantity <= 0}
 											{if $allow_oosp}
 												{$product->available_later|escape:'html':'UTF-8'}
@@ -124,10 +152,17 @@
 												<span>{l s='Add to cart'}</span>
 											</a>
 										{else}
-											<span class="ajax_add_to_cart_button button btn btn-default disabled"><span>{l s='Add to cart'}</span></span>
+											<span class="ajax_add_to_cart_button button btn btn-default disabled">
+												<span>{l s='Add to cart'}</span>
+											</span>
 										{/if}
 									{/if}
-									<a class="button lnk_view btn btn-default" href="{$product->getLink()|escape:html:'UTF-8'}" title="{l s='View'}"><span>{l s='View'}</span></a>
+									<a 
+									class="button lnk_view btn btn-default" 
+									href="{$product->getLink()|escape:html:'UTF-8'}" 
+									title="{l s='View'}">
+										<span>{l s='View'}</span>
+									</a>
 								</div>
 							</div>
 						</div> <!-- end comparison_product_infos -->
diff --git a/themes/default-bootstrap/search.tpl b/themes/default-bootstrap/search.tpl
index a95863f0d..289510442 100644
--- a/themes/default-bootstrap/search.tpl
+++ b/themes/default-bootstrap/search.tpl
@@ -25,9 +25,24 @@
 
 {capture name=path}{l s='Search'}{/capture}
 
-<h1 {if isset($instant_search) && $instant_search}id="instant_search_results"{/if} class="page-heading {if !isset($instant_search) || (isset($instant_search) && !$instant_search)} product-listing{/if}">
-{l s='Search'}&nbsp;{if $nbProducts > 0}<span class="lighter">"{if isset($search_query) && $search_query}{$search_query|escape:'html':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'html':'UTF-8'}{elseif $ref}{$ref|escape:'html':'UTF-8'}{/if}"</span>{/if}
-{if isset($instant_search) && $instant_search}<a href="#" class="close">{l s='Return to the previous page'}</a>{else}<span class="heading-counter">{if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intval}{/if}</span>{/if}
+<h1 
+{if isset($instant_search) && $instant_search}id="instant_search_results"{/if} 
+class="page-heading {if !isset($instant_search) || (isset($instant_search) && !$instant_search)} product-listing{/if}">
+    {l s='Search'}&nbsp;
+    {if $nbProducts > 0}
+        <span class="lighter">
+            "{if isset($search_query) && $search_query}{$search_query|escape:'html':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'html':'UTF-8'}{elseif $ref}{$ref|escape:'html':'UTF-8'}{/if}"
+        </span>
+    {/if}
+    {if isset($instant_search) && $instant_search}
+        <a href="#" class="close">
+            {l s='Return to the previous page'}
+        </a>
+    {else}
+        <span class="heading-counter">
+            {if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intval}{/if}
+        </span>
+    {/if}
 </h1>
 
 {include file="$tpl_dir./errors.tpl"}
@@ -48,21 +63,26 @@
         </p>
     {/if}
     <div class="content_sortPagiBar">
-        
-            <div class="sortPagiBar clearfix {if isset($instant_search) && $instant_search} instant_search{/if}">
-                {include file="$tpl_dir./product-sort.tpl"}
-                {if !isset($instant_search) || (isset($instant_search) && !$instant_search)}{include file="./nbr-product-page.tpl"}{/if}
-            </div>
+        <div class="sortPagiBar clearfix {if isset($instant_search) && $instant_search} instant_search{/if}">
+            {include file="$tpl_dir./product-sort.tpl"}
+            {if !isset($instant_search) || (isset($instant_search) && !$instant_search)}
+                {include file="./nbr-product-page.tpl"}
+            {/if}
+        </div>
     	<div class="top-pagination-content clearfix">
             {include file="./product-compare.tpl"}
-            {if !isset($instant_search) || (isset($instant_search) && !$instant_search)}{include file="$tpl_dir./pagination.tpl"}{/if}
+            {if !isset($instant_search) || (isset($instant_search) && !$instant_search)}
+                {include file="$tpl_dir./pagination.tpl"}
+            {/if}
         </div>
 	</div>
 	{include file="$tpl_dir./product-list.tpl" products=$search_products}
     <div class="content_sortPagiBar">
     	<div class="bottom-pagination-content clearfix">
         	{include file="./product-compare.tpl"}
-        	{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}{include file="$tpl_dir./pagination.tpl" paginationId='bottom'}{/if}
+        	{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}
+                {include file="$tpl_dir./pagination.tpl" paginationId='bottom'}
+            {/if}
         </div>
     </div>
 {/if}
diff --git a/themes/default-bootstrap/supplier-list.tpl b/themes/default-bootstrap/supplier-list.tpl
index 2b384c397..9f642b0cc 100644
--- a/themes/default-bootstrap/supplier-list.tpl
+++ b/themes/default-bootstrap/supplier-list.tpl
@@ -36,7 +36,8 @@
 					{l s='There are %d suppliers.' sprintf=$nbSuppliers}
 				{/if}
 			{/if}
-		</span>{/strip}
+		</span>
+	{/strip}
 </h1>
 
 {if isset($errors) AND $errors}
@@ -47,77 +48,91 @@
 	<div class="content_sortPagiBar">
         <div class="sortPagiBar clearfix">
             <ul class="display hidden-xs">
-                <li class="display-title">{l s='View:'}</li>
-                <li id="grid"><a onclick="display('grid');"><i class="icon-th-large"></i>{l s='Grid'}</a></li>
-                <li id="list"><a onclick="display('list');"><i class="icon-th-list"></i>{l s='List'}</a></li>
+                <li class="display-title">
+                	{l s='View:'}
+                </li>
+                <li id="grid">
+                	<a onclick="display('grid');">
+                		<i class="icon-th-large"></i>{l s='Grid'}
+                	</a>
+                </li>
+                <li id="list">
+                	<a onclick="display('list');">
+                		<i class="icon-th-list"></i>{l s='List'}
+                	</a>
+                </li>
             </ul>
             {include file="./nbr-product-page.tpl"}
         </div>
         <div class="top-pagination-content clearfix bottom-line">
             {include file="$tpl_dir./pagination.tpl"}
         </div>
-    </div>
+    </div> <!-- .content_sortPagiBar --> 
+
     {assign var='nbItemsPerLine' value=3}
     {assign var='nbItemsPerLineTablet' value=2}
     {assign var='nbLi' value=$suppliers_list|@count}
     {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
     {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
+
 	<ul id="suppliers_list">
-	{foreach from=$suppliers_list item=supplier name=supplier}
-    	{math equation="(total%perLine)" total=$smarty.foreach.supplier.total perLine=$nbItemsPerLine assign=totModulo}
-        {math equation="(total%perLineT)" total=$smarty.foreach.supplier.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
-        {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
-        {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
-		<li class="{if $smarty.foreach.supplier.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModulo)}last-line{/if} {if $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModuloTablet)}last-tablet-line{/if}">
-			<div class="left-side">
-				<!-- logo -->
-				<div class="logo">
-					{if $supplier.nb_products > 0}
-						<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{$supplier.name|escape:'html':'UTF-8'}">
-					{/if}
-					<img src="{$img_sup_dir}{$supplier.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
-					{if $supplier.nb_products > 0}
-						</a>
-					{/if}
-				</div>
-			</div>
-			<div class="middle-side">	
-				<!-- name -->
-				<h3>
-					{if $supplier.nb_products > 0}
-						<a class="product-name" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
-					{/if}
-					{$supplier.name|truncate:60:'...'|escape:'html':'UTF-8'}
-					{if $supplier.nb_products > 0}
-						</a>
-					{/if}
-				</h3>
-				<div class="description">
-					{$supplier.description|truncate:180:'...'}
-				</div>
-            </div>
-			<div class="right-side">
-            	<div class="right-side-content">
-                    <p class="product-counter">
-                        {if $supplier.nb_products > 0}
-                            <a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
-                        {/if}
-                        {if $supplier.nb_products == 1}{l s='%d product' sprintf=$supplier.nb_products|intval}{else}{l s='%d products' sprintf=$supplier.nb_products|intval}{/if}
-                    	{if $supplier.nb_products > 0}
-                        	</a>
-                    	{/if}
-                    </p>
-                    {if $supplier.nb_products > 0}
-                        <a class="btn btn-default button exclusive-medium" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='View products'} <i class="icon-chevron-right right"></i></span></a>
-                    {/if}
-                </div>
-			</div>
-		</li>
-	{/foreach}
+		{foreach from=$suppliers_list item=supplier name=supplier}
+	    	{math equation="(total%perLine)" total=$smarty.foreach.supplier.total perLine=$nbItemsPerLine assign=totModulo}
+	        {math equation="(total%perLineT)" total=$smarty.foreach.supplier.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
+	        {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
+	        {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
+			<li class="{if $smarty.foreach.supplier.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModulo)}last-line{/if} {if $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModuloTablet)}last-tablet-line{/if}">
+				<div class="left-side">
+					<!-- logo -->
+					<div class="logo">
+						{if $supplier.nb_products > 0}
+							<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{$supplier.name|escape:'html':'UTF-8'}">
+						{/if}
+						<img src="{$img_sup_dir}{$supplier.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
+						{if $supplier.nb_products > 0}
+							</a>
+						{/if}
+					</div> <!-- .logo -->
+				</div> <!-- .left-side -->
+
+				<div class="middle-side">	
+					<h3>
+						{if $supplier.nb_products > 0}
+							<a class="product-name" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
+						{/if}
+						{$supplier.name|truncate:60:'...'|escape:'html':'UTF-8'}
+						{if $supplier.nb_products > 0}
+							</a>
+						{/if}
+					</h3>
+					<div class="description">
+						{$supplier.description|truncate:180:'...'}
+					</div>
+	            </div><!-- .middle-side -->
+
+				<div class="right-side">
+	            	<div class="right-side-content">
+	                    <p class="product-counter">
+	                        {if $supplier.nb_products > 0}
+	                            <a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
+	                        {/if}
+	                        {if $supplier.nb_products == 1}{l s='%d product' sprintf=$supplier.nb_products|intval}{else}{l s='%d products' sprintf=$supplier.nb_products|intval}{/if}
+	                    	{if $supplier.nb_products > 0}
+	                        	</a>
+	                    	{/if}
+	                    </p>
+	                    {if $supplier.nb_products > 0}
+	                        <a class="btn btn-default button exclusive-medium" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='View products'} <i class="icon-chevron-right right"></i></span></a>
+	                    {/if}
+	                </div>
+				</div><!-- .right-side -->
+				
+			</li>
+		{/foreach}
 	</ul>
 	<div class="content_sortPagiBar">
         <div class="bottom-pagination-content clearfix">
-            {include file="$tpl_dir./pagination.tpl"}
+            {include file="$tpl_dir./pagination.tpl" paginationId='bottom'}
         </div>
     </div>
     <script type="text/javascript"><!--
diff --git a/themes/default-bootstrap/supplier.tpl b/themes/default-bootstrap/supplier.tpl
index b8e97353e..4470e1c49 100644
--- a/themes/default-bootstrap/supplier.tpl
+++ b/themes/default-bootstrap/supplier.tpl
@@ -26,7 +26,9 @@
 {include file="$tpl_dir./errors.tpl"}
 
 {if !isset($errors) OR !sizeof($errors)}
-	<h1 class="page-heading product-listing">{l s='List of products by supplier:'}&nbsp;{$supplier->name|escape:'html':'UTF-8'}</h1>
+	<h1 class="page-heading product-listing">
+		{l s='List of products by supplier:'}&nbsp;{$supplier->name|escape:'html':'UTF-8'}
+	</h1>
 	{if !empty($supplier->description)}
 		<div class="description_box">
 			<p>{$supplier->description}</p>
@@ -34,26 +36,26 @@
 	{/if}
 
 	{if $products}
-	<div class="content_sortPagiBar">
-    	<div class="sortPagiBar clearfix">
-			{include file="./product-sort.tpl"}
-			{include file="./nbr-product-page.tpl"}
+		<div class="content_sortPagiBar">
+	    	<div class="sortPagiBar clearfix">
+				{include file="./product-sort.tpl"}
+				{include file="./nbr-product-page.tpl"}
+			</div>
+	    	<div class="top-pagination-content clearfix">
+	        	{include file="./product-compare.tpl"}
+	            {include file="$tpl_dir./pagination.tpl"}
+	        </div>
 		</div>
-    	<div class="top-pagination-content clearfix">
-        	{include file="./product-compare.tpl"}
-            {include file="$tpl_dir./pagination.tpl"}
-        </div>
-	</div>
 
-	{include file="./product-list.tpl" products=$products}
+		{include file="./product-list.tpl" products=$products}
 
-	<div class="content_sortPagiBar">
-        <div class="bottom-pagination-content clearfix">
-        	{include file="./product-compare.tpl"}
-			{include file="./pagination.tpl" paginationId='bottom'}
-        </div>
-	</div>
+		<div class="content_sortPagiBar">
+	        <div class="bottom-pagination-content clearfix">
+	        	{include file="./product-compare.tpl"}
+				{include file="./pagination.tpl" paginationId='bottom'}
+	        </div>
+		</div>
 	{else}
-	<p class="alert alert-warning">{l s='No products for this supplier.'}</p>
+		<p class="alert alert-warning">{l s='No products for this supplier.'}</p>
 	{/if} 
 {/if}