diff --git a/Model/Config/Source/ListOptions.php b/Model/Config/Source/ListOptions.php
index 6d57ae63..248ad3c2 100644
--- a/Model/Config/Source/ListOptions.php
+++ b/Model/Config/Source/ListOptions.php
@@ -53,7 +53,7 @@ public function toOptionArray()
         }, $result['lists']);
 
         $default_value = [
-            self::LABEL => 'Select a list...',
+            self::LABEL => __('Select a list...'),
             self::VALUE => 0
         ];
         array_unshift($options, $default_value);
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 1f1a02b9..aae34791 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -26,7 +26,7 @@
                     <label>Custom Media URL</label>
                     <validate>validate-url</validate>
                 </field>
-                <field id="logger" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="logger" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Klaviyo Logger</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Log file is located under the standard log directory for your Magento app install. By default this will be {magento-root-directory}/var/log/klaviyo.log</comment>
@@ -46,7 +46,7 @@
                     <source_model>Klaviyo\Reclaim\Model\Config\Source\ListOptions</source_model>
                     <frontend_model>Klaviyo\Reclaim\Block\System\Config\Form\Field\Newsletter</frontend_model>
                 </field>
-                <field id="using_klaviyo_list_opt_in" translate="label" type="radios" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="using_klaviyo_list_opt_in" translate="label comment" type="radios" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use Klaviyo Opt-In Settings For This List?</label>
                     <source_model>Klaviyo\Reclaim\Model\Config\Source\Radiobtn</source_model>
                     <comment>NOTE: There is a separate Magento opt-in setting for this list that can also send opt-in emails</comment>
@@ -60,7 +60,7 @@
             <resource>Klaviyo_Reclaim::klaviyo_reclaim</resource>
             <group id="email_consent" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Email</label>
-                <field id="is_active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="is_active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Subscribe contacts to email marketing at checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Adds a checkbox to the checkout page for email opt in</comment>
@@ -91,7 +91,7 @@
             </group>
             <group id="sms_consent" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>SMS</label>
-                <field id="is_active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="is_active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Subscribe contacts to SMS marketing at checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Adds a checkbox to the checkout page for SMS opt in. <a target="_blank" href="https://help.klaviyo.com/hc/en-us/articles/360039190611-On-Demand-Training-Getting-Started-with-Klaviyo-SMS">Set up SMS in Klaviyo</a>]]></comment>
@@ -153,7 +153,7 @@
                     <label>Webhook Secret</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-                <field id="using_product_delete_before_webhook" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="using_product_delete_before_webhook" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use Product Delete Webhook?</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>This will remove deleted products from the Klaviyo catalog.</comment>
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
index 52ba5b05..cba079a3 100644
--- a/view/frontend/layout/catalog_product_view.xml
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -1,7 +1,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="product.info.main">
-            <block name="klaviyo_reclaim.viewedproduct" class="Klaviyo\Reclaim\Block\Catalog\Product\ViewedProduct" before="-" template="product/viewed.phtml" />
+            <block name="klaviyo_reclaim.viewedproduct" class="Klaviyo\Reclaim\Block\Catalog\Product\ViewedProduct" before="-" template="Klaviyo_Reclaim::product/viewed.phtml" />
         </referenceContainer>
     </body>
 </page>
\ No newline at end of file
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 3a24151e..1417e870 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -1,7 +1,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="header.container">
-            <block class="Klaviyo\Reclaim\Block\Initialize" template="analytics/initialize.phtml" />
+            <block class="Klaviyo\Reclaim\Block\Initialize" template="Klaviyo_Reclaim::analytics/initialize.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/templates/analytics/initialize.phtml b/view/frontend/templates/analytics/initialize.phtml
index df842dba..90877186 100644
--- a/view/frontend/templates/analytics/initialize.phtml
+++ b/view/frontend/templates/analytics/initialize.phtml
@@ -1,5 +1,5 @@
-<?php $klaviyoKey = $this->getPublicApiKey(); ?>
-<?php if ( $this->isKlaviyoEnabled() && $klaviyoKey ): ?>
+<?php $klaviyoKey = $block->getPublicApiKey(); ?>
+<?php if ( $block->isKlaviyoEnabled() && $klaviyoKey ): ?>
 <script type="application/javascript" async 
  src="https://static.klaviyo.com/onsite/js/klaviyo.js?company_id=<?= $block->escapeHtml($klaviyoKey); ?>"></script>
 
diff --git a/view/frontend/templates/checkout/cart.phtml b/view/frontend/templates/checkout/cart.phtml
index b3373396..8af7e623 100644
--- a/view/frontend/templates/checkout/cart.phtml
+++ b/view/frontend/templates/checkout/cart.phtml
@@ -1,4 +1,4 @@
-<?php if ( $this->isKlaviyoEnabled() && $this->getPublicApiKey() ): ?>
+<?php if ( $block->isKlaviyoEnabled() && $block->getPublicApiKey() ): ?>
     <script>
         require([
            'jquery',