diff --git a/themes/default-bootstrap/footer.tpl b/themes/default-bootstrap/footer.tpl
index f572a7af1..11ccecf15 100644
--- a/themes/default-bootstrap/footer.tpl
+++ b/themes/default-bootstrap/footer.tpl
@@ -23,24 +23,23 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 		{if !$content_only}
-                    </div> <!-- #center_column -->
-                    {if isset($right_column_size) && !empty($right_column_size)}
-                    <!-- Right -->
-                        <div id="right_column" class="col-xs-12 col-sm-3 column">
-                            {$HOOK_RIGHT_COLUMN}
-                        </div>
-                    {/if}
-                	</div> <!-- .row -->
+					</div> <!-- #center_column -->
+					{if isset($right_column_size) && !empty($right_column_size)}
+						<div id="right_column" class="col-xs-12 col-sm-3 column">
+							{$HOOK_RIGHT_COLUMN}
+						</div>
+					{/if}
+					</div> <!-- .row -->
 				</div> <!-- #columns -->
-            </div> <!-- .columns-container -->
+			</div> <!-- .columns-container -->
 <!-- Footer -->
 			<div class="footer-container">
-            	<div class="container">
-                    <footer id="footer" class="row">
-                        {$HOOK_FOOTER}
-                    </footer>
-                </div>
-            </div> <!-- .footer-container -->
+				<div class="container">
+					<footer id="footer" class="row">
+						{$HOOK_FOOTER}
+					</footer>
+				</div>
+			</div> <!-- .footer-container -->
 		</div> <!-- #page -->
 	{/if}
 	</body>
diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl
index fd7fa552c..fa06645fe 100644
--- a/themes/default-bootstrap/header.tpl
+++ b/themes/default-bootstrap/header.tpl
@@ -44,12 +44,12 @@
 		
 		<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
 		<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
-		<link href="{$css_dir}bootstrap_lib/bootstrap.css" rel="stylesheet" type="text/css" media="all" />
-		<link href="{$css_dir}font-awesome.css" rel="stylesheet" type="text/css" media="all" />
-		<link href="{$css_dir}jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" />
-		<link href="{$css_dir}highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
-		<link href="{$css_dir}jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" />
-		<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
+		<link rel="stylesheet" href="{$css_dir}bootstrap_lib/bootstrap.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="{$css_dir}font-awesome.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="{$css_dir}jquery/uniform.default.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="{$css_dir}highdpi.css" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
+		<link rel="stylesheet" href="{$css_dir}jquery/footable.core.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="{$css_dir}jquery/jquery.bxslider.css" type="text/css" media="all" />
 		<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
 		{if isset($css_files)}
 			{foreach from=$css_files key=css_uri item=media}
@@ -62,11 +62,10 @@
 				var viewport = document.querySelector("meta[name=viewport]");
 				viewport.setAttribute('content', 'initial-scale=1.0,maximum-scale=1.0,user-scalable=0,width=device-width,height=device-height');
 			}
-				if(navigator.userAgent.match(/Android/i)){
+			if(navigator.userAgent.match(/Android/i)){
 				window.scrollTo(0,1);
-			 }
-		</script>
-		<script type="text/javascript">
+			}
+
 			var baseDir = '{$content_dir|addslashes}';
 			var baseUri = '{$base_uri|addslashes}';
 			var static_token = '{$static_token|addslashes}';
@@ -111,9 +110,9 @@
 							 
 							<div id="header_user_info">
 								{if $logged}
-									<a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a>
+									<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
 								{else}
-									<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a>
+									<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
 								{/if}
 							</div> <!-- #header_user_info -->
 
@@ -128,23 +127,23 @@
 											{/if}
 										{/foreach}
 										<ul id="first-languages" class="countries_ul toogle_content">
-										{foreach from=$languages key=k item=language name="languages"}
-											<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
-											{if $language.iso_code != $lang_iso}
-												{assign var=indice_lang value=$language.id_lang}
-												{if isset($lang_rewrite_urls.$indice_lang)}
-													<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
-												{else}
-													<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
-								
+											{foreach from=$languages key=k item=language name="languages"}
+												<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
+												{if $language.iso_code != $lang_iso}
+													{assign var=indice_lang value=$language.id_lang}
+													{if isset($lang_rewrite_urls.$indice_lang)}
+														<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
+													{else}
+														<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
+									
+													{/if}
 												{/if}
-											{/if}
-													<span>{$language.name}</span>
-											{if $language.iso_code != $lang_iso}
-												</a>
-											{/if}
-											</li>
-										{/foreach}
+														<span>{$language.name}</span>
+												{if $language.iso_code != $lang_iso}
+													</a>
+												{/if}
+												</li>
+											{/foreach}
 										</ul>
 									</div>
 								</div> <!-- #languages-block-top -->
@@ -177,7 +176,7 @@
 										<ul id="first-currencies" class="currencies_ul toogle_content">
 											{foreach from=$currencies key=k item=f_currency}
 												<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
-													<a href="javascript:setCurrency({$f_currency.id_currency});" title="{$f_currency.name}" rel="nofollow">{$f_currency.name}</a>
+													<a href="javascript:setCurrency({$f_currency.id_currency});" rel="nofollow" title="{$f_currency.name}">{$f_currency.name}</a>
 												</li>
 											{/foreach}
 										</ul>
diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl
index 4ed71252d..dde273005 100644
--- a/themes/default-bootstrap/product-list.tpl
+++ b/themes/default-bootstrap/product-list.tpl
@@ -51,31 +51,32 @@
 			<div class="product-container" itemscope itemtype="http://schema.org/Product">
 				<div class="left-block">
 					<div class="product-image-container">
-						<a 
-						itemprop="url" 
-						href="{$product.link|escape:'html':'UTF-8'}" class="product_img_link" 
-						title="{$product.name|escape:'html':'UTF-8'}">
+						<a
+							class="product_img_link"
+							href="{$product.link|escape:'html':'UTF-8'}"  
+							title="{$product.name|escape:'html':'UTF-8'}"
+							itemprop="url">
 							<img 
-							itemprop="image" 
-							class="replace-2x img-responsive" 
-							src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" 
-							alt="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}" 
-							title="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}" 
-							{if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
+								class="replace-2x img-responsive" 
+								src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" 
+								alt="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}" 
+								title="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}" 
+								{if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if}
+								itemprop="image" />
 						</a>
 						{if isset($quick_view) && $quick_view}
-							<a 
-							href="#" 
-							rel="{$product.link|escape:'html':'UTF-8'}" 
-							class="quick-view">
-								<span>Quick view</span>
+							<a  
+								class="quick-view"
+								href="#" 
+								rel="{$product.link|escape:'html':'UTF-8'}">
+									<span>Quick view</span>
 							</a>
 						{/if}
 						{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
 							<div 
-							itemprop="offers" 
-							itemscope itemtype="http://schema.org/Offer" 
-							class="content_price">
+								class="content_price"
+								itemprop="offers" 
+								itemscope itemtype="http://schema.org/Offer">
 								{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
 									<span itemprop="price" class="price product-price">
 										{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}
@@ -108,10 +109,10 @@
 					<h5 itemprop="name">
 						{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}
 						<a 
-						class="product-name" 
-						itemprop="url" 
-						href="{$product.link|escape:'html':'UTF-8'}" 
-						title="{$product.name|escape:'html':'UTF-8'}">
+							class="product-name" 
+							href="{$product.link|escape:'html':'UTF-8'}" 
+							title="{$product.name|escape:'html':'UTF-8'}"
+							itemprop="url" >
 							{$product.name|truncate:45:'...'|escape:'html':'UTF-8'}
 						</a>
 					</h5>
@@ -147,24 +148,28 @@
 								{if isset($static_token)}
 									<a
 										class="button ajax_add_to_cart_button btn btn-default" 
+										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;
 										rel="nofollow"
+										title="{l s='Add to cart'}"
 										data-id-product="{$product.id_product|intval}"
-										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;token={$static_token}", false)|escape:'html'}"
-										title="{l s='Add to cart'}">
+										token={$static_token}", false)|escape:'html'}">
 										<span>{l s='Add to cart'}</span>
 									</a>
 								{else}
 									<a
 										class="button ajax_add_to_cart_button btn btn-default"
-										rel="nofollow"
-										data-id-product="{$product.id_product|intval}"
 										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}", false)|escape:'html'}"
-										title="{l s='Add to cart'}">
+										rel="nofollow"
+
+										title="{l s='Add to cart'}"
+										data-id-product="{$product.id_product|intval}">
 										<span>{l s='Add to cart'}</span>
 									</a>
 								{/if}						
 							{else}
-								<span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart'}</span></span>
+								<span class="button ajax_add_to_cart_button btn btn-default disabled">
+									<span>{l s='Add to cart'}</span>
+								</span>
 							{/if}
 						{/if}
 						<a itemprop="url" class="button lnk_view btn btn-default" href="{$product.link|escape:'html':'UTF-8'}" title="{l s='View'}">
@@ -214,7 +219,7 @@
 					{hook h='displayProductListFunctionalButtons' product=$product}
 					{if isset($comparator_max_item) && $comparator_max_item}
 						<div class="compare">
-							<a href="#" data-id-product="{$product.id_product}" class="addToCompare" onClick="addToCompare('{$product.id_product|intval}'); return false;">{l s='Add to Compare'}</a>
+							<a class="addToCompare" href="#" data-id-product="{$product.id_product}" onClick="addToCompare('{$product.id_product|intval}'); return false;">{l s='Add to Compare'}</a>
 						</div>
 					{/if}
 				</div>