diff --git a/Views/frontend/plugins/nosto_tagging/addtocart_script.tpl b/Views/frontend/plugins/nosto_tagging/addtocart_script.tpl
new file mode 100644
index 00000000..04ba8725
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/addtocart_script.tpl
@@ -0,0 +1,70 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_addtocart_script"}
+	<script type="text/javascript">
+		//<![CDATA[
+		{literal}
+		if (typeof Nosto === "undefined") {
+			var Nosto = {};
+		}
+		{/literal}
+		Nosto.addProductToCart = function (productNumber) {
+			var form = document.createElement("form");
+			form.setAttribute("method", "post");
+			form.setAttribute("action", "{url controller=checkout action=addArticle}");
+
+			var hiddenFields = {
+				"sActionIdentifier": "{$sUniqueRand}",
+				"sAdd": productNumber,
+				"sQuantity": 1
+			};
+
+			for(var key in hiddenFields) {
+				if(hiddenFields.hasOwnProperty(key)) {
+					var hiddenField = document.createElement("input");
+					hiddenField.setAttribute("type", "hidden");
+					hiddenField.setAttribute("name", key);
+					hiddenField.setAttribute("value", hiddenFields[key]);
+					form.appendChild(hiddenField);
+				}
+			}
+
+			document.body.appendChild(form);
+			form.submit();
+		};
+		//]]>
+	</script>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/cart_tagging.tpl b/Views/frontend/plugins/nosto_tagging/cart_tagging.tpl
new file mode 100644
index 00000000..445e7d6c
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/cart_tagging.tpl
@@ -0,0 +1,50 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_cart"}
+	<div class="nosto_cart" style="display:none">
+		{if isset($nostoCart) && is_object($nostoCart)}
+		{foreach from=$nostoCart->getLineItems() item=lineItem}
+			<div class="line_item">
+				<span class="product_id">{$lineItem->getProductId()|escape:'htmlall':'UTF-8'}</span>
+				<span class="quantity">{$lineItem->getQuantity()|escape:'htmlall':'UTF-8'}</span>
+				<span class="name">{$lineItem->getName()|escape:'htmlall':'UTF-8'}</span>
+				<span class="unit_price">{$lineItem->getUnitPrice()->getPrice()|number_format:2:".":""}</span>
+				<span class="price_currency_code">{$lineItem->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
+			</div>
+		{/foreach}
+		{/if}
+	</div>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/checkout/cart.tpl b/Views/frontend/plugins/nosto_tagging/checkout/cart.tpl
index 51e980b5..877ca603 100644
--- a/Views/frontend/plugins/nosto_tagging/checkout/cart.tpl
+++ b/Views/frontend/plugins/nosto_tagging/checkout/cart.tpl
@@ -34,7 +34,5 @@
 *}
 
 {block name="frontend_index_content" append}
-    <div class="nosto_element" id="nosto-page-cart1"></div>
-    <div class="nosto_element" id="nosto-page-cart3"></div>
-    <div class="nosto_element" id="nosto-page-cart2"></div>
+	{include file="frontend/plugins/nosto_tagging/checkout/cart_recos.tpl"}
 {/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/checkout/cart_recos.tpl b/Views/frontend/plugins/nosto_tagging/checkout/cart_recos.tpl
new file mode 100644
index 00000000..be1e951a
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/checkout/cart_recos.tpl
@@ -0,0 +1,40 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_cart_recos"}
+    <div class="nosto_element" id="nosto-page-cart1"></div>
+    <div class="nosto_element" id="nosto-page-cart3"></div>
+    <div class="nosto_element" id="nosto-page-cart2"></div>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/checkout/finish.tpl b/Views/frontend/plugins/nosto_tagging/checkout/finish.tpl
index bf18a65c..956dcec1 100644
--- a/Views/frontend/plugins/nosto_tagging/checkout/finish.tpl
+++ b/Views/frontend/plugins/nosto_tagging/checkout/finish.tpl
@@ -34,28 +34,5 @@
 *}
 
 {block name="frontend_index_content" append}
-{if isset($nostoOrder) && is_object($nostoOrder)}
-	<div class="nosto_purchase_order" style="display:none">
-		<span class="order_number">{$nostoOrder->getOrderNumber()|escape:'htmlall':'UTF-8'}</span>
-		<span class="order_status_code">{$nostoOrder->getOrderStatus()->getCode()|escape:'htmlall':'UTF-8'}</span>
-		<span class="order_status_label">{$nostoOrder->getOrderStatus()->getLabel()|escape:'htmlall':'UTF-8'}</span>
-		<span class="payment_provider">{$nostoOrder->getPaymentProvider()|escape:'htmlall':'UTF-8'}</span>
-		<div class="buyer">
-			<span class="first_name">{$nostoOrder->getBuyerInfo()->getFirstName()|escape:'htmlall':'UTF-8'}</span>
-			<span class="last_name">{$nostoOrder->getBuyerInfo()->getLastName()|escape:'htmlall':'UTF-8'}</span>
-			<span class="email">{$nostoOrder->getBuyerInfo()->getEmail()|escape:'htmlall':'UTF-8'}</span>
-		</div>
-		<div class="purchased_items">
-			{foreach from=$nostoOrder->getPurchasedItems() item=lineItem}
-				<div class="line_item">
-					<span class="product_id">{$lineItem->getProductId()|escape:'htmlall':'UTF-8'}</span>
-					<span class="quantity">{$lineItem->getQuantity()|escape:'htmlall':'UTF-8'}</span>
-					<span class="name">{$lineItem->getName()|escape:'htmlall':'UTF-8'}</span>
-					<span class="unit_price">{$lineItem->getUnitPrice()->getPrice()|number_format:2:".":""}</span>
-					<span class="price_currency_code">{$lineItem->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
-				</div>
-			{/foreach}
-		</div>
-	</div>
-{/if}
-{/block}
+	{include file="frontend/plugins/nosto_tagging/checkout/order_tagging.tpl"}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/checkout/order_tagging.tpl b/Views/frontend/plugins/nosto_tagging/checkout/order_tagging.tpl
new file mode 100644
index 00000000..ad2e9d0b
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/checkout/order_tagging.tpl
@@ -0,0 +1,61 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_order"}
+	{if isset($nostoOrder) && is_object($nostoOrder)}
+		<div class="nosto_purchase_order" style="display:none">
+			<span class="order_number">{$nostoOrder->getOrderNumber()|escape:'htmlall':'UTF-8'}</span>
+			<span class="order_status_code">{$nostoOrder->getOrderStatus()->getCode()|escape:'htmlall':'UTF-8'}</span>
+			<span class="order_status_label">{$nostoOrder->getOrderStatus()->getLabel()|escape:'htmlall':'UTF-8'}</span>
+			<span class="payment_provider">{$nostoOrder->getPaymentProvider()|escape:'htmlall':'UTF-8'}</span>
+			<div class="buyer">
+				<span class="first_name">{$nostoOrder->getBuyerInfo()->getFirstName()|escape:'htmlall':'UTF-8'}</span>
+				<span class="last_name">{$nostoOrder->getBuyerInfo()->getLastName()|escape:'htmlall':'UTF-8'}</span>
+				<span class="email">{$nostoOrder->getBuyerInfo()->getEmail()|escape:'htmlall':'UTF-8'}</span>
+			</div>
+			<div class="purchased_items">
+				{foreach from=$nostoOrder->getPurchasedItems() item=lineItem}
+					<div class="line_item">
+						<span class="product_id">{$lineItem->getProductId()|escape:'htmlall':'UTF-8'}</span>
+						<span class="quantity">{$lineItem->getQuantity()|escape:'htmlall':'UTF-8'}</span>
+						<span class="name">{$lineItem->getName()|escape:'htmlall':'UTF-8'}</span>
+						<span class="unit_price">{$lineItem->getUnitPrice()->getPrice()|number_format:2:".":""}</span>
+						<span class="price_currency_code">{$lineItem->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
+					</div>
+				{/foreach}
+			</div>
+		</div>
+	{/if}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/customer_tagging.tpl b/Views/frontend/plugins/nosto_tagging/customer_tagging.tpl
new file mode 100644
index 00000000..1b644912
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/customer_tagging.tpl
@@ -0,0 +1,44 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_customer"}
+	{if isset($nostoCustomer) && is_object($nostoCustomer)}
+		<div class="nosto_customer" style="display:none">
+			<span class="first_name">{$nostoCustomer->getFirstName()|escape:'htmlall':'UTF-8'}</span>
+			<span class="last_name">{$nostoCustomer->getLastName()|escape:'htmlall':'UTF-8'}</span>
+			<span class="email">{$nostoCustomer->getEmail()|escape:'htmlall':'UTF-8'}</span>
+		</div>
+	{/if}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/detail/index.tpl b/Views/frontend/plugins/nosto_tagging/detail/index.tpl
index 02a17a19..d958df2a 100644
--- a/Views/frontend/plugins/nosto_tagging/detail/index.tpl
+++ b/Views/frontend/plugins/nosto_tagging/detail/index.tpl
@@ -34,59 +34,6 @@
 *}
 
 {block name="frontend_index_content" append}
-    <div class="nosto_element" id="nosto-page-product1"></div>
-    <div class="nosto_element" id="nosto-page-product2"></div>
-    <div class="nosto_element" id="nosto-page-product3"></div>
-	{if isset($nostoProduct) && is_object($nostoProduct)}
-		<div class="nosto_product" style="display: none">
-			<span class="url">{$nostoProduct->getUrl()|escape:'htmlall':'UTF-8'}</span>
-			<span class="product_id">{$nostoProduct->getProductId()|escape:'htmlall':'UTF-8'}</span>
-			<span class="name">{$nostoProduct->getName()|escape:'htmlall':'UTF-8'}</span>
-			<span class="image_url">{$nostoProduct->getImageUrl()|escape:'htmlall':'UTF-8'}</span>
-			{if $nostoProduct->getPrice()}
-				<span class="price">{$nostoProduct->getPrice()->getPrice()|number_format:2:".":""}</span>
-			{/if}
-			{if $nostoProduct->getCurrency()}
-				<span class="price_currency_code">{$nostoProduct->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
-			{/if}
-			{if $nostoProduct->getAvailability()}
-				<span class="availability">{$nostoProduct->getAvailability()->getAvailability()|escape:'htmlall':'UTF-8'}</span>
-			{/if}
-			{foreach from=$nostoProduct->getCategories() item=category}
-				<span class="category">{$category|escape:'htmlall':'UTF-8'}</span>
-			{/foreach}
-			{if $nostoProduct->getFullDescription()}
-				<span class="description">{$nostoProduct->getFullDescription()|escape:'htmlall':'UTF-8'}</span>
-			{/if}
-			{if $nostoProduct->getListPrice()}
-				<span class="list_price">{$nostoProduct->getListPrice()->getPrice()|number_format:2:".":""}</span>
-			{/if}
-			{if $nostoProduct->getBrand()}
-				<span class="brand">{$nostoProduct->getBrand()|escape:'htmlall':'UTF-8'}</span>
-			{/if}
-			{foreach from=$nostoProduct->getTags() key=type item=tags}
-				{foreach from=$tags item=tag}
-					<span class="{$type|escape:'quotes'}">{$tag|escape:'htmlall':'UTF-8'}</span>
-				{/foreach}
-			{/foreach}
-			{if $nostoProduct->getDatePublished()}
-				<span class="date_published">{$nostoProduct->getDatePublished()|date_format:'%Y-%m-%d'}</span>
-			{/if}
-			{if $nostoProduct->getPriceVariationId()}
-				<span class="variation_id">{$nostoProduct->getPriceVariationId()|escape:'htmlall':'UTF-8'}</span>
-				{foreach from=$nostoProduct->getPriceVariations() item=variation}
-					<div class="variation">
-						<span class="variation_id">{$variation->getId()->getId()|escape:'htmlall':'UTF-8'}</span>
-						<span class="price_currency_code">{$variation->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
-						<span class="price">{$variation->getPrice()->getPrice()|number_format:2:".":""}</span>
-						<span class="list_price">{$variation->getListPrice()->getPrice()|number_format:2:".":""}</span>
-						<span class="availability">{$variation->getAvailability()->getAvailability()|escape:'htmlall':'UTF-8'}</span>
-					</div>
-				{/foreach}
-			{/if}
-		</div>
-	{/if}
-	{if isset($nostoCategory) && is_object($nostoCategory)}
-		<div class="nosto_category" style="display:none">{$nostoCategory->getCategoryPath()|escape:'htmlall':'UTF-8'}</div>
-	{/if}
+	{include file="frontend/plugins/nosto_tagging/detail/product_recos.tpl"}
+	{include file="frontend/plugins/nosto_tagging/detail/product_tagging.tpl"}
 {/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/detail/product_recos.tpl b/Views/frontend/plugins/nosto_tagging/detail/product_recos.tpl
new file mode 100644
index 00000000..78cff036
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/detail/product_recos.tpl
@@ -0,0 +1,40 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_product_recos"}
+	<div class="nosto_element" id="nosto-page-product1"></div>
+	<div class="nosto_element" id="nosto-page-product2"></div>
+	<div class="nosto_element" id="nosto-page-product3"></div>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/detail/product_tagging.tpl b/Views/frontend/plugins/nosto_tagging/detail/product_tagging.tpl
new file mode 100644
index 00000000..1863ea77
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/detail/product_tagging.tpl
@@ -0,0 +1,91 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_product"}
+	{if isset($nostoProduct) && is_object($nostoProduct)}
+		<div class="nosto_product" style="display: none">
+			<span class="url">{$nostoProduct->getUrl()|escape:'htmlall':'UTF-8'}</span>
+			<span class="product_id">{$nostoProduct->getProductId()|escape:'htmlall':'UTF-8'}</span>
+			<span class="name">{$nostoProduct->getName()|escape:'htmlall':'UTF-8'}</span>
+			<span class="image_url">{$nostoProduct->getImageUrl()|escape:'htmlall':'UTF-8'}</span>
+			{if $nostoProduct->getPrice()}
+				<span class="price">{$nostoProduct->getPrice()->getPrice()|number_format:2:".":""}</span>
+			{/if}
+			{if $nostoProduct->getCurrency()}
+				<span class="price_currency_code">{$nostoProduct->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
+			{/if}
+			{if $nostoProduct->getAvailability()}
+				<span class="availability">{$nostoProduct->getAvailability()->getAvailability()|escape:'htmlall':'UTF-8'}</span>
+			{/if}
+			{foreach from=$nostoProduct->getCategories() item=category}
+				<span class="category">{$category|escape:'htmlall':'UTF-8'}</span>
+			{/foreach}
+			{if $nostoProduct->getFullDescription()}
+				<span class="description">{$nostoProduct->getFullDescription()|escape:'htmlall':'UTF-8'}</span>
+			{/if}
+			{if $nostoProduct->getListPrice()}
+				<span class="list_price">{$nostoProduct->getListPrice()->getPrice()|number_format:2:".":""}</span>
+			{/if}
+			{if $nostoProduct->getBrand()}
+				<span class="brand">{$nostoProduct->getBrand()|escape:'htmlall':'UTF-8'}</span>
+			{/if}
+			{foreach from=$nostoProduct->getTags() key=type item=tags}
+				{foreach from=$tags item=tag}
+					<span class="{$type|escape:'quotes'}">{$tag|escape:'htmlall':'UTF-8'}</span>
+				{/foreach}
+			{/foreach}
+			{if $nostoProduct->getDatePublished()}
+				<span class="date_published">{$nostoProduct->getDatePublished()|date_format:'%Y-%m-%d'}</span>
+			{/if}
+			{if $nostoProduct->getPriceVariationId()}
+				<span class="variation_id">{$nostoProduct->getPriceVariationId()|escape:'htmlall':'UTF-8'}</span>
+				{foreach from=$nostoProduct->getPriceVariations() item=variation}
+					<div class="variation">
+						<span class="variation_id">{$variation->getId()->getId()|escape:'htmlall':'UTF-8'}</span>
+						<span class="price_currency_code">{$variation->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
+						<span class="price">{$variation->getPrice()->getPrice()|number_format:2:".":""}</span>
+						<span class="list_price">{$variation->getListPrice()->getPrice()|number_format:2:".":""}</span>
+						<span class="availability">{$variation->getAvailability()->getAvailability()|escape:'htmlall':'UTF-8'}</span>
+					</div>
+				{/foreach}
+			{/if}
+		</div>
+	{/if}
+{/block}
+{block name="nosto_product_category"}
+	{if isset($nostoCategory) && is_object($nostoCategory)}
+		<div class="nosto_category" style="display:none">{$nostoCategory->getCategoryPath()|escape:'htmlall':'UTF-8'}</div>
+	{/if}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/embed_script.tpl b/Views/frontend/plugins/nosto_tagging/embed_script.tpl
new file mode 100644
index 00000000..e6a89ad9
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/embed_script.tpl
@@ -0,0 +1,49 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_embed_script"}
+	{if isset($nostoServerUrl) && isset($nostoAccountName)}
+		{if $nostoScriptDirectInclude}
+			<script type="text/javascript" src="//{$nostoServerUrl|escape:"javascript":"UTF-8"}/include/{$nostoAccountName|escape:"javascript":"UTF-8"}" async></script>
+		{else}
+			<script type="text/javascript">
+				//<![CDATA[
+				{literal}(function(){function a(a){var b,c,d=window.document.createElement("iframe");d.src="javascript:false",(d.frameElement||d).style.cssText="width: 0; height: 0; border: 0";var e=window.document.createElement("div");e.style.display="none";var f=window.document.createElement("div");e.appendChild(f),window.document.body.insertBefore(e,window.document.body.firstChild),f.appendChild(d);try{c=d.contentWindow.document}catch(g){b=document.domain,d.src="javascript:var d=document.open();d.domain='"+b+"';void(0);",c=d.contentWindow.document}return c.open()._l=function(){b&&(this.domain=b);var c=this.createElement("scr".concat("ipt"));c.src=a,this.body.appendChild(c)},c.write("<bo".concat('dy onload="document._l();">')),c.close(),d}var b="nostojs";window[b]=window[b]||function(a){(window[b].q=window[b].q||[]).push(a)},window[b].l=new Date;var c=function(d,e){if(!document.body)return setTimeout(function(){c(d,e)},30);e=e||{},window[b].o=e;var f=document.location.protocol,g=["https:"===f?f:"http:","//",e.host||"connect.nosto.com",e.path||"/include/",d].join("");a(g)};window[b].init=c})();{/literal}
+				nostojs.init("{$nostoAccountName|escape:"javascript":"UTF-8"}", {literal}{host:{/literal} "{$nostoServerUrl|escape:"javascript":"UTF-8"}"{literal}}{/literal});
+				//]]>
+			</script>
+		{/if}
+	{/if}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/index.tpl b/Views/frontend/plugins/nosto_tagging/index.tpl
index ef72b6f1..6e6982a4 100644
--- a/Views/frontend/plugins/nosto_tagging/index.tpl
+++ b/Views/frontend/plugins/nosto_tagging/index.tpl
@@ -34,81 +34,14 @@
 *}
 
 {block name='frontend_index_header_meta_tags' append}
-	<meta name="nosto-version" content="{$nostoVersion|escape:'quotes'}">
-	<meta name="nosto-unique-id" content="{$nostoUniqueId|escape:'quotes'}">
-	<meta name="nosto-language" content="{$nostoLanguage|escape:'quotes'}">
+	{include file="frontend/plugins/nosto_tagging/meta_tags.tpl"}
 {/block}
 {block name="frontend_index_header_javascript" append}
-{if isset($nostoServerUrl) && isset($nostoAccountName)}
-    {if $nostoScriptDirectInclude}
-        <script type="text/javascript" src="//{$nostoServerUrl|escape:"javascript":"UTF-8"}/include/{$nostoAccountName|escape:"javascript":"UTF-8"}" async></script>
-    {else}
-        <script type="text/javascript">
-            //<![CDATA[
-            {literal}(function(){function a(a){var b,c,d=window.document.createElement("iframe");d.src="javascript:false",(d.frameElement||d).style.cssText="width: 0; height: 0; border: 0";var e=window.document.createElement("div");e.style.display="none";var f=window.document.createElement("div");e.appendChild(f),window.document.body.insertBefore(e,window.document.body.firstChild),f.appendChild(d);try{c=d.contentWindow.document}catch(g){b=document.domain,d.src="javascript:var d=document.open();d.domain='"+b+"';void(0);",c=d.contentWindow.document}return c.open()._l=function(){b&&(this.domain=b);var c=this.createElement("scr".concat("ipt"));c.src=a,this.body.appendChild(c)},c.write("<bo".concat('dy onload="document._l();">')),c.close(),d}var b="nostojs";window[b]=window[b]||function(a){(window[b].q=window[b].q||[]).push(a)},window[b].l=new Date;var c=function(d,e){if(!document.body)return setTimeout(function(){c(d,e)},30);e=e||{},window[b].o=e;var f=document.location.protocol,g=["https:"===f?f:"http:","//",e.host||"connect.nosto.com",e.path||"/include/",d].join("");a(g)};window[b].init=c})();{/literal}
-            nostojs.init("{$nostoAccountName|escape:"javascript":"UTF-8"}", {literal}{host:{/literal} "{$nostoServerUrl|escape:"javascript":"UTF-8"}"{literal}}{/literal});
-            //]]>
-        </script>
-    {/if}
-	<script type="text/javascript">
-		//<![CDATA[
-		{literal}
-		if (typeof Nosto === "undefined") {
-			var Nosto = {};
-		}
-		{/literal}
-		Nosto.addProductToCart = function (productNumber) {
-			var form = document.createElement("form");
-			form.setAttribute("method", "post");
-			form.setAttribute("action", "{url controller=checkout action=addArticle}");
-
-			var hiddenFields = {
-				"sActionIdentifier": "{$sUniqueRand}",
-				"sAdd": productNumber,
-				"sQuantity": 1
-			};
-
-			for(var key in hiddenFields) {
-				if(hiddenFields.hasOwnProperty(key)) {
-					var hiddenField = document.createElement("input");
-					hiddenField.setAttribute("type", "hidden");
-					hiddenField.setAttribute("name", key);
-					hiddenField.setAttribute("value", hiddenFields[key]);
-					form.appendChild(hiddenField);
-				}
-			}
-
-			document.body.appendChild(form);
-			form.submit();
-		};
-		//]]>
-	</script>
-{/if}
+	{include file="frontend/plugins/nosto_tagging/embed_script.tpl"}
+	{include file="frontend/plugins/nosto_tagging/addtocart_script.tpl"}
 {/block}
 {block name="frontend_index_content" append}
-	{if isset($nostoCustomer) && is_object($nostoCustomer)}
-		<div class="nosto_customer" style="display:none">
-			<span class="first_name">{$nostoCustomer->getFirstName()|escape:'htmlall':'UTF-8'}</span>
-			<span class="last_name">{$nostoCustomer->getLastName()|escape:'htmlall':'UTF-8'}</span>
-			<span class="email">{$nostoCustomer->getEmail()|escape:'htmlall':'UTF-8'}</span>
-		</div>
-	{/if}
-	<div class="nosto_cart" style="display:none">
-		{if isset($nostoCart) && is_object($nostoCart)}
-		{foreach from=$nostoCart->getLineItems() item=lineItem}
-			<div class="line_item">
-				<span class="product_id">{$lineItem->getProductId()|escape:'htmlall':'UTF-8'}</span>
-				<span class="quantity">{$lineItem->getQuantity()|escape:'htmlall':'UTF-8'}</span>
-				<span class="name">{$lineItem->getName()|escape:'htmlall':'UTF-8'}</span>
-				<span class="unit_price">{$lineItem->getUnitPrice()->getPrice()|number_format:2:".":""}</span>
-				<span class="price_currency_code">{$lineItem->getCurrency()->getCode()|escape:'htmlall':'UTF-8'}</span>
-			</div>
-		{/foreach}
-		{/if}
-	</div>
-	{if isset($nostoPriceVariation) && is_object($nostoPriceVariation)}
-		<div class="nosto_price_variation" style="display:none">
-			{$nostoPriceVariation->getId()|escape:'htmlall':'UTF-8'}
-		</div>
-	{/if}
+	{include file="frontend/plugins/nosto_tagging/customer_tagging.tpl"}
+	{include file="frontend/plugins/nosto_tagging/cart_tagging.tpl"}
+	{include file="frontend/plugins/nosto_tagging/variation_tagging.tpl"}
 {/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/index/front_recos.tpl b/Views/frontend/plugins/nosto_tagging/index/front_recos.tpl
new file mode 100644
index 00000000..2ca73924
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/index/front_recos.tpl
@@ -0,0 +1,41 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_front_recos"}
+	<div class="nosto_element" id="frontpage-nosto-1"></div>
+	<div class="nosto_element" id="frontpage-nosto-2"></div>
+	<div class="nosto_element" id="frontpage-nosto-3"></div>
+	<div class="nosto_element" id="frontpage-nosto-4"></div>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/index/index.tpl b/Views/frontend/plugins/nosto_tagging/index/index.tpl
index 842665d5..65b0487e 100644
--- a/Views/frontend/plugins/nosto_tagging/index/index.tpl
+++ b/Views/frontend/plugins/nosto_tagging/index/index.tpl
@@ -34,8 +34,5 @@
 *}
 
 {block name="frontend_index_content" append}
-	<div class="nosto_element" id="frontpage-nosto-1"></div>
-	<div class="nosto_element" id="frontpage-nosto-2"></div>
-	<div class="nosto_element" id="frontpage-nosto-3"></div>
-	<div class="nosto_element" id="frontpage-nosto-4"></div>
+	{include file="frontend/plugins/nosto_tagging/index/front_recos.tpl"}
 {/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/listing/category_recos.tpl b/Views/frontend/plugins/nosto_tagging/listing/category_recos.tpl
new file mode 100644
index 00000000..8874ff9e
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/listing/category_recos.tpl
@@ -0,0 +1,39 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_category_recos"}
+    <div class="nosto_element" id="nosto-page-category1"></div>
+    <div class="nosto_element" id="nosto-page-category2"></div>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/listing/category_tagging.tpl b/Views/frontend/plugins/nosto_tagging/listing/category_tagging.tpl
new file mode 100644
index 00000000..81653658
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/listing/category_tagging.tpl
@@ -0,0 +1,40 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_category"}
+	{if isset($nostoCategory) && is_object($nostoCategory)}
+		<div class="nosto_category" style="display:none">{$nostoCategory->getCategoryPath()|escape:'htmlall':'UTF-8'}</div>
+	{/if}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/listing/index.tpl b/Views/frontend/plugins/nosto_tagging/listing/index.tpl
index eef3a346..d7901912 100644
--- a/Views/frontend/plugins/nosto_tagging/listing/index.tpl
+++ b/Views/frontend/plugins/nosto_tagging/listing/index.tpl
@@ -34,9 +34,6 @@
 *}
 
 {block name="frontend_index_content" append}
-    <div class="nosto_element" id="nosto-page-category1"></div>
-    <div class="nosto_element" id="nosto-page-category2"></div>
-	{if isset($nostoCategory) && is_object($nostoCategory)}
-		<div class="nosto_category" style="display:none">{$nostoCategory->getCategoryPath()|escape:'htmlall':'UTF-8'}</div>
-	{/if}
+	{include file="frontend/plugins/nosto_tagging/listing/category_recos.tpl"}
+	{include file="frontend/plugins/nosto_tagging/listing/category_tagging.tpl"}
 {/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/meta_tags.tpl b/Views/frontend/plugins/nosto_tagging/meta_tags.tpl
new file mode 100644
index 00000000..a1abf40a
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/meta_tags.tpl
@@ -0,0 +1,40 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name='nosto_meta_tags'}
+	<meta name="nosto-version" content="{$nostoVersion|escape:'quotes'}">
+	<meta name="nosto-unique-id" content="{$nostoUniqueId|escape:'quotes'}">
+	<meta name="nosto-language" content="{$nostoLanguage|escape:'quotes'}">
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/search/index.tpl b/Views/frontend/plugins/nosto_tagging/search/index.tpl
index cfd95575..766d8fba 100644
--- a/Views/frontend/plugins/nosto_tagging/search/index.tpl
+++ b/Views/frontend/plugins/nosto_tagging/search/index.tpl
@@ -33,13 +33,7 @@
 * @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
 *}
 
-{block name="frontend_index_content" prepend}
-    <div class="nosto_element" id="nosto-page-search1"></div>
-{/block}
-
 {block name="frontend_index_content" append}
-    <div class="nosto_element" id="nosto-page-search2"></div>
-	{if isset($nostoSearch) && is_object($nostoSearch)}
-		<div class="nosto_search_term" style="display:none">{$nostoSearch->getSearchTerm()|escape:'htmlall':'UTF-8'}</div>
-	{/if}
+	{include file="frontend/plugins/nosto_tagging/search/search_recos.tpl"}
+	{include file="frontend/plugins/nosto_tagging/search/search_tagging.tpl"}
 {/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/search/search_recos.tpl b/Views/frontend/plugins/nosto_tagging/search/search_recos.tpl
new file mode 100644
index 00000000..75132d04
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/search/search_recos.tpl
@@ -0,0 +1,39 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_search_recos"}
+	<div class="nosto_element" id="nosto-page-search1"></div>
+    <div class="nosto_element" id="nosto-page-search2"></div>
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/search/search_tagging.tpl b/Views/frontend/plugins/nosto_tagging/search/search_tagging.tpl
new file mode 100644
index 00000000..f8fb15b0
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/search/search_tagging.tpl
@@ -0,0 +1,40 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_search"}
+	{if isset($nostoSearch) && is_object($nostoSearch)}
+		<div class="nosto_search_term" style="display:none">{$nostoSearch->getSearchTerm()|escape:'htmlall':'UTF-8'}</div>
+	{/if}
+{/block}
\ No newline at end of file
diff --git a/Views/frontend/plugins/nosto_tagging/variation_tagging.tpl b/Views/frontend/plugins/nosto_tagging/variation_tagging.tpl
new file mode 100644
index 00000000..56c935e6
--- /dev/null
+++ b/Views/frontend/plugins/nosto_tagging/variation_tagging.tpl
@@ -0,0 +1,42 @@
+{**
+* Copyright (c) 2015, Nosto Solutions Ltd
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* @author Nosto Solutions Ltd <shopware@nosto.com>
+* @copyright Copyright (c) 2015 Nosto Solutions Ltd (http://www.nosto.com)
+* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+*}
+
+{block name="nosto_variation"}
+	{if isset($nostoPriceVariation) && is_object($nostoPriceVariation)}
+		<div class="nosto_price_variation" style="display:none">
+			{$nostoPriceVariation->getId()|escape:'htmlall':'UTF-8'}
+		</div>
+	{/if}
+{/block}
\ No newline at end of file