diff --git a/apps/storefront/src/components/layout/B3Logo.tsx b/apps/storefront/src/components/layout/B3Logo.tsx
index 23a584f2..70656f65 100644
--- a/apps/storefront/src/components/layout/B3Logo.tsx
+++ b/apps/storefront/src/components/layout/B3Logo.tsx
@@ -4,6 +4,7 @@ import { useContext } from 'react'
 // } from '@mui/material/styles'
 import { Box, ImageListItem } from '@mui/material'
 
+import { STORE_DEFAULT_LOGO } from '@/constants'
 import { useMobile } from '@/hooks'
 import { GlobaledContext } from '@/shared/global'
 
@@ -50,7 +51,7 @@ export default function B3Logo() {
           window.location.href = '/'
         }}
       >
-        <img src={logo} alt="logo" />
+        <img src={logo || STORE_DEFAULT_LOGO} alt="logo" />
       </ImageListItem>
     </Box>
   )
diff --git a/apps/storefront/src/components/layout/B3Nav.tsx b/apps/storefront/src/components/layout/B3Nav.tsx
index 54fea701..74fd4cf5 100644
--- a/apps/storefront/src/components/layout/B3Nav.tsx
+++ b/apps/storefront/src/components/layout/B3Nav.tsx
@@ -63,7 +63,9 @@ export default function B3Nav({ closeSidebar }: B3NavProps) {
             open: true,
             title: 'Registration',
             message:
-              'Please create an account, or login to create a shopping list.',
+              item.configKey === 'shoppingLists'
+                ? 'Please create an account, or login to create a shopping list.'
+                : 'To receive full access to buyer portal, please register. It will take 2 minutes.',
             cancelText: 'Cancel',
             saveText: 'Register',
             saveFn: jumpRegister,
diff --git a/apps/storefront/src/constants/index.ts b/apps/storefront/src/constants/index.ts
index 87449eaf..e4f1e24a 100644
--- a/apps/storefront/src/constants/index.ts
+++ b/apps/storefront/src/constants/index.ts
@@ -21,3 +21,6 @@ export const re = {
 
 export const PRODUCT_DEFAULT_IMAGE =
   'https://cdn11.bigcommerce.com/s-1i6zpxpe3g/stencil/cd9e3830-4c73-0139-8a51-0242ac11000a/e/4fe76590-73f1-0139-3767-32e4ea84ca1d/img/ProductDefault.gif'
+
+export const STORE_DEFAULT_LOGO =
+  'https://cdn.bundleb2b.net/b2blogo/b2be-logo.png'
diff --git a/apps/storefront/src/utils/storefrontConfig.ts b/apps/storefront/src/utils/storefrontConfig.ts
index faec0aca..aabedd5b 100644
--- a/apps/storefront/src/utils/storefrontConfig.ts
+++ b/apps/storefront/src/utils/storefrontConfig.ts
@@ -134,6 +134,52 @@ const getTemPlateConfig = async (
       if (storeforntKey.key === 'quote_logo') {
         logo = item.value
       }
+      if (storeforntKey.key === 'quote_on_product_page') {
+        item.extraFields = {
+          ...item.extraFields,
+          locationSelector:
+            item.extraFields?.locationSelector || '.add-to-cart-buttons',
+          classSelector: item.extraFields?.classSelector || 'button',
+          customCss: item.extraFields?.customCss || 'margin-top: 0.5rem',
+        }
+      }
+
+      if (storeforntKey.key === 'quote_on_cart_page') {
+        item.extraFields = {
+          ...item.extraFields,
+          classSelector: item.extraFields?.classSelector || 'button',
+        }
+      }
+      if (storeforntKey.key === 'masquerade_button') {
+        item.extraFields = {
+          ...item.extraFields,
+          color: item.extraFields?.color || '#ED6C02',
+          location: item.extraFields?.location || ' bottomLeft',
+          horizontalPadding: item.extraFields?.horizontalPadding || '20',
+          verticalPadding: item.extraFields?.verticalPadding || '20',
+        }
+      }
+
+      if (storeforntKey.key === 'quote_floating_action_button') {
+        item.extraFields = {
+          ...item.extraFields,
+          color: item.extraFields?.color || '#E00F36',
+          location: item.extraFields?.location || ' bottomRight',
+          horizontalPadding: item.extraFields?.horizontalPadding || '20',
+          verticalPadding: item.extraFields?.verticalPadding || '20',
+        }
+      }
+
+      if (storeforntKey.key === 'shopping_list_on_product_page') {
+        item.extraFields = {
+          ...item.extraFields,
+          locationSelector:
+            item.extraFields?.locationSelector || '.add-to-cart-buttons',
+          classSelector: item.extraFields?.classSelector || 'button',
+          customCss: item.extraFields?.customCss || 'margin-top: 0.5rem',
+        }
+      }
+
       ;(obj as CustomFieldItems)[(storeforntKey as StoreforntKeysProps).name] =
         {
           ...item.extraFields,