diff --git a/composer.json b/composer.json
index c11f567..e04d72f 100755
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "magento/framework": "100.0.*|100.1.*"
     },
     "type": "magento2-module",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/etc/module.xml b/etc/module.xml
index 1bb43c7..7895667 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MagePal_GoogleTagManager" setup_version="1.2.2">
+    <module name="MagePal_GoogleTagManager" setup_version="1.2.3">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index b985772..9b49269 100755
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -8,8 +8,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="after.body.start">
-          <block class="MagePal\GoogleTagManager\Block\Tm" name="magepal_gtm_datalayer" as="magepal_gtm_datalayer" template="data_layer.phtml" />
-          <block class="MagePal\GoogleTagManager\Block\GtmCode" name="gtm_code" as="gtm_code" template="gtm_code.phtml" />
+          <block class="MagePal\GoogleTagManager\Block\GtmCode" name="gtm_iframe" as="gtm_iframe" template="MagePal_GoogleTagManager::iframe.phtml" />
         </referenceContainer>
+        <referenceBlock name="head.additional">
+            <block class="MagePal\GoogleTagManager\Block\Tm" name="magepal_gtm_datalayer" as="magepal_gtm_datalayer" template="MagePal_GoogleTagManager::data_layer.phtml" />
+            <block class="MagePal\GoogleTagManager\Block\GtmCode" name="gtm_js" as="gtm_js" template="MagePal_GoogleTagManager::js.phtml" />
+        </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/templates/data_layer.phtml b/view/frontend/templates/data_layer.phtml
index f577eb3..8402009 100755
--- a/view/frontend/templates/data_layer.phtml
+++ b/view/frontend/templates/data_layer.phtml
@@ -7,7 +7,7 @@
  */
 ?>
 
-<script>
+<script type="text/javascript">
 window.dataLayer = window.dataLayer || [];
 <?php /** @var $block \MagePal\GoogleTagManager\Block\Tm **/ ?>
 <?php echo $block->getGtmTrackingCode(); ?>
diff --git a/view/frontend/templates/iframe.phtml b/view/frontend/templates/iframe.phtml
new file mode 100755
index 0000000..6ea88d3
--- /dev/null
+++ b/view/frontend/templates/iframe.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * MagePal Google Tag Manager for Magento 2
+ *
+ * Copyright © 2016 MagePal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php /** @var $block \MagePal\GoogleTagManager\Block\Tm **/ ?>
+<?php $accountId = $block->getAccountId(); ?>
+
+<!-- Google Tag Manager by MagePal -->
+<noscript><iframe src="//www.googletagmanager.com/ns.html?id=<?php echo $accountId ?>"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager by MagePal -->
diff --git a/view/frontend/templates/gtm_code.phtml b/view/frontend/templates/js.phtml
similarity index 80%
rename from view/frontend/templates/gtm_code.phtml
rename to view/frontend/templates/js.phtml
index 38db40b..4bdd652 100755
--- a/view/frontend/templates/gtm_code.phtml
+++ b/view/frontend/templates/js.phtml
@@ -10,8 +10,6 @@
 <?php $accountId = $block->getAccountId(); ?>
 
 <!-- Google Tag Manager by MagePal -->
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id=<?php echo $accountId ?>"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
