diff --git a/Block/System/Config/Form/Field/ApiNote.php b/Block/System/Config/Form/Field/ApiNote.php
deleted file mode 100644
index 2574572..0000000
--- a/Block/System/Config/Form/Field/ApiNote.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Bold\Checkout\Block\System\Config\Form\Field;
-
-use Magento\Config\Block\System\Config\Form\Field;
-use Magento\Framework\Data\Form\Element\AbstractElement;
-
-/**
- * Bold Integration api note field.
- */
-class ApiNote extends Field
-{
-    /**
-     * @inheritDoc
-     */
-    protected function _renderValue(AbstractElement $element)
-    {
-        $text = __('Please switch website scopes first to add an API Token.');
-        $element->setText($text);
-
-        return parent::_renderValue($element);
-    }
-}
diff --git a/Block/System/Config/Form/Field/Note.php b/Block/System/Config/Form/Field/Note.php
index e7dfee1..e925a23 100644
--- a/Block/System/Config/Form/Field/Note.php
+++ b/Block/System/Config/Form/Field/Note.php
@@ -17,7 +17,7 @@ class Note extends Field
      */
     protected function _renderValue(AbstractElement $element)
     {
-        $text = __('Please set up a separate Bold Store for each Magento website.');
+        $text = __('All settings can by found on the Website scope level.');
         $element->setText($text);
 
         return parent::_renderValue($element);
diff --git a/Observer/Checkout/CheckoutSectionSave.php b/Observer/Checkout/CheckoutSectionSave.php
index 9036e8e..8d52df0 100644
--- a/Observer/Checkout/CheckoutSectionSave.php
+++ b/Observer/Checkout/CheckoutSectionSave.php
@@ -58,7 +58,7 @@ public function execute(Observer $observer): void
     {
         $event = $observer->getEvent();
         $websiteId = (int)$event->getWebsite();
-        if (!$this->config->isCheckoutEnabled($websiteId) || $websiteId === 0) {
+        if (!$this->config->isCheckoutEnabled($websiteId)) {
             return;
         }
         $this->config->setShopId($websiteId, null);
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 1291f24..6c3be9e 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -8,13 +8,13 @@
                 <field id="comment" translate="label" type="note" sortOrder="1" showInDefault="1">
                     <frontend_model>Bold\Checkout\Block\System\Config\Form\Field\Note</frontend_model>
                 </field>
-                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="0" showInWebsite="1">
                     <label>Enable Bold Checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
                         <![CDATA[Refer to the <a target='_blank' href="https://developer.boldcommerce.com/default/guides/platform-integration/magento-1">documentation</a> for more details.]]></comment>
                 </field>
-                <field id="type" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1">
+                <field id="type" translate="label" type="select" sortOrder="15" showInDefault="0" showInWebsite="1">
                     <label>Bold Checkout Type</label>
                     <source_model>Bold\Checkout\Model\Config\Source\CheckoutTypeSource</source_model>
                     <comment><![CDATA[
@@ -24,14 +24,14 @@
                         Self-Hosted (React application) - replace the native checkout with Bold Checkout's React application.
                     ]]></comment>
                 </field>
-                <field id="payment_title" translate="label" type="text" sortOrder="16" showInDefault="1" showInWebsite="1">
+                <field id="payment_title" translate="label" type="text" sortOrder="16" showInDefault="0" showInWebsite="1">
                     <label>Payment Title</label>
                     <comment>Payment title that will be displayed on the checkout page.</comment>
                     <depends>
                         <field id="type">2</field>
                     </depends>
                 </field>
-                <field id="parallel_checkout_button_title" translate="label" type="text" sortOrder="17" showInDefault="1" showInWebsite="1">
+                <field id="parallel_checkout_button_title" translate="label" type="text" sortOrder="17" showInDefault="0" showInWebsite="1">
                     <label>Bold Checkout Button Title</label>
                     <comment>Bold Checkout button title that will be displayed on the checkout page.</comment>
                     <depends>
@@ -47,22 +47,18 @@
                         Center.
                     </comment>
                 </field>
-                <field id="api_token_note" translate="label" type="note" sortOrder="25" showInDefault="1">
-                    <label>API Token</label>
-                    <frontend_model>Bold\Checkout\Block\System\Config\Form\Field\ApiNote</frontend_model>
-                </field>
-                <field id="integration_email" translate="select" type="select" sortOrder="30" showInDefault="1"
+                <field id="integration_email" translate="select" type="select" sortOrder="30" showInDefault="0"
                        showInWebsite="1">
                     <label>Bold Integration Email</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="integration_callback_url" translate="label" type="text" sortOrder="40" showInDefault="1"
+                <field id="integration_callback_url" translate="label" type="text" sortOrder="40" showInDefault="0"
                        showInWebsite="1">
                     <label>Bold Integration Callback URL</label>
                     <validate>required-entry</validate>
                     <comment><![CDATA[Please do not change.]]></comment>
                 </field>
-                <field id="integration_identity_url" translate="label" type="text" sortOrder="50" showInDefault="1"
+                <field id="integration_identity_url" translate="label" type="text" sortOrder="50" showInDefault="0"
                        showInWebsite="1">
                     <label>Bold Integration Identity Link URL</label>
                     <validate>required-entry</validate>
@@ -77,7 +73,10 @@
             </group>
             <group id="bold_checkout_life_elements" translate="label" sortOrder="105" showInDefault="1" showInWebsite="1">
                 <label>Bold Checkout Integration (LiFE) Elements</label>
-                <field id="life_elements" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
+                <field id="comment" translate="label" type="note" sortOrder="1" showInDefault="1">
+                    <frontend_model>Bold\Checkout\Block\System\Config\Form\Field\Note</frontend_model>
+                </field>
+                <field id="life_elements" translate="label" sortOrder="10" showInDefault="0" showInWebsite="1">
                     <label>Custom elements</label>
                     <frontend_model>Bold\Checkout\Block\System\Config\Form\Field\LifeElements</frontend_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
@@ -89,13 +88,16 @@
             </group>
             <group id="bold_checkout_advanced" translate="label" sortOrder="110" showInDefault="1" showInWebsite="1">
                 <label>Bold Checkout Integration Advanced Setting</label>
-                <field id="enabled_for" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
+                <field id="comment" translate="label" type="note" sortOrder="1" showInDefault="1">
+                    <frontend_model>Bold\Checkout\Block\System\Config\Form\Field\Note</frontend_model>
+                </field>
+                <field id="enabled_for" translate="label" type="select" sortOrder="10" showInDefault="0" showInWebsite="1">
                     <label>Enabled For</label>
                     <source_model>\Bold\Checkout\Model\Config\Source\EnabledForSource</source_model>
                     <comment>Configure Bold Checkout access limitations. Select 'All' to remove all limitations.
                     </comment>
                 </field>
-                <field id="ip_whitelist" translate="label" type="textarea" sortOrder="20" showInDefault="1" showInWebsite="1">
+                <field id="ip_whitelist" translate="label" type="textarea" sortOrder="20" showInDefault="0" showInWebsite="1">
                     <label>IP List</label>
                     <depends>
                         <field id="enabled_for">1</field>
@@ -103,7 +105,7 @@
                     <comment>Only customers with listed IPs will be able to navigate to Bold Checkout.
                         Please add whitelisted IPs separated by comma.</comment>
                 </field>
-                <field id="customer_whitelist" translate="label" type="textarea" sortOrder="30" showInDefault="1" showInWebsite="1">
+                <field id="customer_whitelist" translate="label" type="textarea" sortOrder="30" showInDefault="0" showInWebsite="1">
                     <label>Customer List</label>
                     <depends>
                         <field id="enabled_for">2</field>
@@ -111,7 +113,7 @@
                     <comment>Only customers with listed emails will be able to navigate to Bold Checkout.
                         Please add whitelisted Customer emails separated by comma.</comment>
                 </field>
-                <field id="orders_percentage" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
+                <field id="orders_percentage" translate="label" type="select" sortOrder="30" showInDefault="0" showInWebsite="1">
                     <label>Orders Percentage</label>
                     <source_model>\Bold\Checkout\Model\Config\Source\PercentageSource</source_model>
                     <depends>
@@ -120,22 +122,22 @@
                     <comment>Percentage of carts will be redirected to Bold Checkout.
                         Please select the percentage of Orders to be placed using Bold Checkout.</comment>
                 </field>
-                <field id="platform_connector_url" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
+                <field id="platform_connector_url" translate="label" type="text" sortOrder="60" showInDefault="0" showInWebsite="1">
                     <label>M2 Platform Connector API Url</label>
                     <validate>required-url</validate>
                     <comment>M2 Platform Connector API URL.</comment>
                 </field>
-                <field id="api_url" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
+                <field id="api_url" translate="label" type="text" sortOrder="70" showInDefault="0" showInWebsite="1">
                     <label>Api URL</label>
                     <validate>required-url</validate>
                     <comment><![CDATA[Bold API URL. Do not change.]]></comment>
                 </field>
-                <field id="checkout_url" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
+                <field id="checkout_url" translate="label" type="text" sortOrder="70" showInDefault="0" showInWebsite="1">
                     <label>Checkout URL</label>
                     <validate>required-url</validate>
                     <comment><![CDATA[Bold Checkout API URL. Do not change.]]></comment>
                 </field>
-                <field id="log_enabled" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
+                <field id="log_enabled" translate="label" type="select" sortOrder="80" showInDefault="0" showInWebsite="1">
                     <label>Enable Bold Checkout Requests Log</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Log Bold Checkout requests for debugging purpose.]]></comment>