diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php
index c10929524..4fb722608 100644
--- a/bluehost-wordpress-plugin.php
+++ b/bluehost-wordpress-plugin.php
@@ -12,7 +12,7 @@
  * Plugin URI:        https://bluehost.com
  * Update URI:        https://github.com/bluehost/bluehost-wordpress-plugin
  * Description:       WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
- * Version:           3.11.0
+ * Version:           3.12.0
  * Requires at least: 6.0
  * Requires PHP:      7.1
  * Tested up to:      6.5.4
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.11.0' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.12.0' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
diff --git a/composer.json b/composer.json
index 834326d42..5f29dc55d 100644
--- a/composer.json
+++ b/composer.json
@@ -70,24 +70,25 @@
     "roave/security-advisories": "dev-latest",
     "newfold-labs/wp-php-standards": "^1.2.3",
     "wp-cli/i18n-command": "^2.6.1",
-    "wp-phpunit/wp-phpunit": "^6.5.3"
+    "wp-phpunit/wp-phpunit": "^6.5.4"
   },
   "require": {
     "newfold-labs/wp-module-activation": "^1.0.2",
     "newfold-labs/wp-module-atomic": "^1.3.0",
-    "newfold-labs/wp-module-coming-soon": "^1.2.4",
+    "newfold-labs/wp-module-coming-soon": "^1.2.5",
     "newfold-labs/wp-module-context": "^1.0.1",
-    "newfold-labs/wp-module-data": "^2.5.2",
-    "newfold-labs/wp-module-deactivation": "^1.1.2",
-    "newfold-labs/wp-module-ecommerce": "^1.3.31",
-    "newfold-labs/wp-module-facebook": "1.0.7",
+    "newfold-labs/wp-module-data": "^2.5.3",
+    "newfold-labs/wp-module-deactivation": "^1.2.1",
+    "newfold-labs/wp-module-ecommerce": "^1.3.33",
+    "newfold-labs/wp-module-facebook": "^1.0.9",
     "newfold-labs/wp-module-features": "^1.4.1",
     "newfold-labs/wp-module-global-ctb": "^1.0.12",
     "newfold-labs/wp-module-help-center": "^2.0.0",
     "newfold-labs/wp-module-loader": "^1.0.10",
-    "newfold-labs/wp-module-marketplace": "^2.2.4",
+    "newfold-labs/wp-module-marketplace": "^2.3.0",
+    "newfold-labs/wp-module-migration": "^1.0.6",
     "newfold-labs/wp-module-notifications": "^1.3.0",
-    "newfold-labs/wp-module-onboarding": "^2.3.2",
+    "newfold-labs/wp-module-onboarding": "^2.3.4",
     "newfold-labs/wp-module-patterns": "2.0.0 as 1.9.9",
     "newfold-labs/wp-module-performance": "2.0.0 as 1.9.9",
     "newfold-labs/wp-module-runtime": "^1.0.11",
diff --git a/composer.lock b/composer.lock
index 02f7c54b4..57c66efd7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3197dd5d34c42e25a193a02e09fc1e8b",
+    "content-hash": "849bde744ef141a051740cb9c61158fc",
     "packages": [
         {
             "name": "doctrine/inflector",
@@ -396,16 +396,16 @@
         },
         {
             "name": "newfold-labs/wp-module-coming-soon",
-            "version": "1.2.4",
+            "version": "1.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-coming-soon.git",
-                "reference": "05112a5908bb08ca0aa3aa7d7e7c508d44401b28"
+                "reference": "36da71998930ffc6fcb13d2ea082b82507a284b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-coming-soon/zipball/05112a5908bb08ca0aa3aa7d7e7c508d44401b28",
-                "reference": "05112a5908bb08ca0aa3aa7d7e7c508d44401b28",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-coming-soon/zipball/36da71998930ffc6fcb13d2ea082b82507a284b2",
+                "reference": "36da71998930ffc6fcb13d2ea082b82507a284b2",
                 "shasum": ""
             },
             "require": {
@@ -443,10 +443,10 @@
             ],
             "description": "Coming Soon module for WordPress sites.",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-coming-soon/tree/1.2.4",
+                "source": "https://github.com/newfold-labs/wp-module-coming-soon/tree/1.2.5",
                 "issues": "https://github.com/newfold-labs/wp-module-coming-soon/issues"
             },
-            "time": "2024-05-31T16:22:17+00:00"
+            "time": "2024-06-19T19:13:33+00:00"
         },
         {
             "name": "newfold-labs/wp-module-context",
@@ -504,16 +504,16 @@
         },
         {
             "name": "newfold-labs/wp-module-data",
-            "version": "2.5.2",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-data.git",
-                "reference": "bd9642c155735fac8f114ea1eb237da4a72eb267"
+                "reference": "6c0941bc9ac3d18820f924de8c4afe58bb421782"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/bd9642c155735fac8f114ea1eb237da4a72eb267",
-                "reference": "bd9642c155735fac8f114ea1eb237da4a72eb267",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/6c0941bc9ac3d18820f924de8c4afe58bb421782",
+                "reference": "6c0941bc9ac3d18820f924de8c4afe58bb421782",
                 "shasum": ""
             },
             "require": {
@@ -526,10 +526,20 @@
             },
             "require-dev": {
                 "10up/wp_mock": "^0.4.2",
+                "bluehost/bluehost-wordpress-plugin": "*",
+                "brianhenryie/composer-phpstorm": "*",
                 "johnpbloch/wordpress": "*",
-                "newfold-labs/wp-php-standards": "^1.2"
+                "kporras07/composer-symlinks": "^1.2",
+                "lucatume/wp-browser": "^3",
+                "newfold-labs/wp-php-standards": "^1.2",
+                "wpackagist-plugin/woocommerce": "*"
             },
             "type": "library",
+            "extra": {
+                "symlinks": {
+                    ".": "wp-content/plugins/bluehost-wordpress-plugin/vendor/newfold-labs/wp-module-data"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "NewfoldLabs\\WP\\Module\\Data\\": "includes/"
@@ -540,8 +550,14 @@
             },
             "autoload-dev": {
                 "psr-4": {
-                    "NewfoldLabs\\WP\\Module\\Data\\": "tests/phpunit/includes/"
-                }
+                    "NewfoldLabs\\WP\\Module\\Data\\": [
+                        "tests/phpunit/includes/",
+                        "tests/wpunit/includes"
+                    ]
+                },
+                "classmap": [
+                    "wordpress"
+                ]
             },
             "scripts": {
                 "fix": [
@@ -552,6 +568,15 @@
                 ],
                 "lint": [
                     "vendor/bin/phpcs . --standard=phpcs.xml -s"
+                ],
+                "create-symlinks": [
+                    "Kporras07\\ComposerSymlinks\\ScriptHandler::createSymlinks"
+                ],
+                "post-install-cmd": [
+                    "@create-symlinks"
+                ],
+                "post-update-cmd": [
+                    "@create-symlinks"
                 ]
             },
             "license": [
@@ -559,23 +584,23 @@
             ],
             "description": "Newfold Data Module",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-data/tree/2.5.2",
+                "source": "https://github.com/newfold-labs/wp-module-data/tree/2.5.3",
                 "issues": "https://github.com/newfold-labs/wp-module-data/issues"
             },
-            "time": "2024-05-30T18:45:12+00:00"
+            "time": "2024-06-19T17:34:08+00:00"
         },
         {
             "name": "newfold-labs/wp-module-deactivation",
-            "version": "1.1.2",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-deactivation.git",
-                "reference": "9c45ae78cbae1ea5f1c3e2fa3c5eccae3af59275"
+                "reference": "7aa6aa4e9b594929c9c4f3088320b5db6b537ee5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-deactivation/zipball/9c45ae78cbae1ea5f1c3e2fa3c5eccae3af59275",
-                "reference": "9c45ae78cbae1ea5f1c3e2fa3c5eccae3af59275",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-deactivation/zipball/7aa6aa4e9b594929c9c4f3088320b5db6b537ee5",
+                "reference": "7aa6aa4e9b594929c9c4f3088320b5db6b537ee5",
                 "shasum": ""
             },
             "require": {
@@ -620,23 +645,23 @@
             ],
             "description": "A Module for handling WordPress brand plugins and modules deactivations",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-deactivation/tree/1.1.2",
+                "source": "https://github.com/newfold-labs/wp-module-deactivation/tree/1.2.1",
                 "issues": "https://github.com/newfold-labs/wp-module-deactivation/issues"
             },
-            "time": "2024-04-22T16:34:09+00:00"
+            "time": "2024-06-19T18:29:23+00:00"
         },
         {
             "name": "newfold-labs/wp-module-ecommerce",
-            "version": "v1.3.31",
+            "version": "v1.3.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-ecommerce.git",
-                "reference": "24ef99c9b697f2c30172a95c5f6fa0470b9b2604"
+                "reference": "9b848fee173f5688e4424dd010cad18914975678"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/24ef99c9b697f2c30172a95c5f6fa0470b9b2604",
-                "reference": "24ef99c9b697f2c30172a95c5f6fa0470b9b2604",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/9b848fee173f5688e4424dd010cad18914975678",
+                "reference": "9b848fee173f5688e4424dd010cad18914975678",
                 "shasum": ""
             },
             "require": {
@@ -679,23 +704,23 @@
             ],
             "description": "Brand Agnostic eCommerce Experience",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.31",
+                "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.33",
                 "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues"
             },
-            "time": "2024-05-20T12:40:55+00:00"
+            "time": "2024-06-18T08:53:05+00:00"
         },
         {
             "name": "newfold-labs/wp-module-facebook",
-            "version": "v1.0.7",
+            "version": "v1.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-facebook.git",
-                "reference": "77a433621894590b3d38c511d880d830fb3b4b64"
+                "reference": "5526497969f6a3fc4d4b2fa728ee1c9c52d132b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-facebook/zipball/77a433621894590b3d38c511d880d830fb3b4b64",
-                "reference": "77a433621894590b3d38c511d880d830fb3b4b64",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-facebook/zipball/5526497969f6a3fc4d4b2fa728ee1c9c52d132b8",
+                "reference": "5526497969f6a3fc4d4b2fa728ee1c9c52d132b8",
                 "shasum": ""
             },
             "require": {
@@ -721,10 +746,10 @@
                 }
             ],
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-facebook/tree/v1.0.7",
+                "source": "https://github.com/newfold-labs/wp-module-facebook/tree/v1.0.9",
                 "issues": "https://github.com/newfold-labs/wp-module-facebook/issues"
             },
-            "time": "2024-05-03T10:09:41+00:00"
+            "time": "2024-06-05T11:02:38+00:00"
         },
         {
             "name": "newfold-labs/wp-module-features",
@@ -1009,20 +1034,20 @@
         },
         {
             "name": "newfold-labs/wp-module-marketplace",
-            "version": "2.2.4",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-marketplace.git",
-                "reference": "3b1864b75d069ca896e205792209a797a24f2abb"
+                "reference": "2d5064b3a935246f4e05f826b97663bdaa251d3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-marketplace/zipball/3b1864b75d069ca896e205792209a797a24f2abb",
-                "reference": "3b1864b75d069ca896e205792209a797a24f2abb",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-marketplace/zipball/2d5064b3a935246f4e05f826b97663bdaa251d3e",
+                "reference": "2d5064b3a935246f4e05f826b97663bdaa251d3e",
                 "shasum": ""
             },
             "require": {
-                "newfold-labs/wp-module-data": "^2.0.0"
+                "newfold-labs/wp-module-data": "^2.5.2"
             },
             "require-dev": {
                 "newfold-labs/wp-php-standards": "^1.2"
@@ -1059,23 +1084,23 @@
             ],
             "description": "A module for rendering product data and interacting with the Hiive marketplace API.",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-marketplace/tree/2.2.4",
+                "source": "https://github.com/newfold-labs/wp-module-marketplace/tree/2.3.0",
                 "issues": "https://github.com/newfold-labs/wp-module-marketplace/issues"
             },
-            "time": "2024-02-27T17:01:06+00:00"
+            "time": "2024-06-18T05:06:33+00:00"
         },
         {
             "name": "newfold-labs/wp-module-migration",
-            "version": "v1.0.3",
+            "version": "v1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-migration.git",
-                "reference": "69407754a69cd6e8bc6fb48e9daa361285541e45"
+                "reference": "be8804c858a812afa33343de1b8133612c923772"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-migration/zipball/69407754a69cd6e8bc6fb48e9daa361285541e45",
-                "reference": "69407754a69cd6e8bc6fb48e9daa361285541e45",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-migration/zipball/be8804c858a812afa33343de1b8133612c923772",
+                "reference": "be8804c858a812afa33343de1b8133612c923772",
                 "shasum": ""
             },
             "require": {
@@ -1113,10 +1138,10 @@
             ],
             "description": "Initiates the migration process",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-migration/tree/v1.0.3",
+                "source": "https://github.com/newfold-labs/wp-module-migration/tree/v1.0.6",
                 "issues": "https://github.com/newfold-labs/wp-module-migration/issues"
             },
-            "time": "2024-05-27T06:29:53+00:00"
+            "time": "2024-06-19T22:12:33+00:00"
         },
         {
             "name": "newfold-labs/wp-module-notifications",
@@ -1165,16 +1190,16 @@
         },
         {
             "name": "newfold-labs/wp-module-onboarding",
-            "version": "2.3.2",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-onboarding.git",
-                "reference": "5d73dec28f11e3ab305ee3ebd05c118636af4d70"
+                "reference": "243277e79a3bd42f16b4d186f4575bf46fea67c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding/zipball/5d73dec28f11e3ab305ee3ebd05c118636af4d70",
-                "reference": "5d73dec28f11e3ab305ee3ebd05c118636af4d70",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding/zipball/243277e79a3bd42f16b4d186f4575bf46fea67c7",
+                "reference": "243277e79a3bd42f16b4d186f4575bf46fea67c7",
                 "shasum": ""
             },
             "require": {
@@ -1220,23 +1245,23 @@
             ],
             "description": "Next-generation WordPress Onboarding for WordPress sites at Newfold Digital.",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-onboarding/tree/2.3.2",
+                "source": "https://github.com/newfold-labs/wp-module-onboarding/tree/2.3.4",
                 "issues": "https://github.com/newfold-labs/wp-module-onboarding/issues"
             },
-            "time": "2024-05-28T09:12:14+00:00"
+            "time": "2024-06-14T13:15:51+00:00"
         },
         {
             "name": "newfold-labs/wp-module-onboarding-data",
-            "version": "1.1.10",
+            "version": "1.1.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-module-onboarding-data.git",
-                "reference": "32963151eda0eb2f93a77a9a0fa55d1ec8c9aed5"
+                "reference": "efce79142be2deb7382b0c500a17be75fc9a5708"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding-data/zipball/32963151eda0eb2f93a77a9a0fa55d1ec8c9aed5",
-                "reference": "32963151eda0eb2f93a77a9a0fa55d1ec8c9aed5",
+                "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding-data/zipball/efce79142be2deb7382b0c500a17be75fc9a5708",
+                "reference": "efce79142be2deb7382b0c500a17be75fc9a5708",
                 "shasum": ""
             },
             "require": {
@@ -1271,10 +1296,10 @@
             ],
             "description": "A non-toggleable module containing a standardized interface for interacting with Onboarding data.",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-module-onboarding-data/tree/1.1.10",
+                "source": "https://github.com/newfold-labs/wp-module-onboarding-data/tree/1.1.12",
                 "issues": "https://github.com/newfold-labs/wp-module-onboarding-data/issues"
             },
-            "time": "2024-05-27T09:30:23+00:00"
+            "time": "2024-06-14T12:45:33+00:00"
         },
         {
             "name": "newfold-labs/wp-module-patterns",
@@ -2738,12 +2763,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "8583ee6fe6fdd08d3dbf9c273fa41704c3a919c1"
+                "reference": "22f9af2d843383f1c25638b07d8cbcf18482527e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8583ee6fe6fdd08d3dbf9c273fa41704c3a919c1",
-                "reference": "8583ee6fe6fdd08d3dbf9c273fa41704c3a919c1",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/22f9af2d843383f1c25638b07d8cbcf18482527e",
+                "reference": "22f9af2d843383f1c25638b07d8cbcf18482527e",
                 "shasum": ""
             },
             "conflict": {
@@ -2751,7 +2776,8 @@
                 "admidio/admidio": "<4.2.13",
                 "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
                 "aheinze/cockpit": "<2.2",
-                "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7",
+                "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.21|>=2022.04.1,<2022.10.12|>=2023.04.1,<2023.10.14|>=2024.04.1,<2024.04.4",
+                "aimeos/aimeos-core": "<2024.04.7",
                 "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5",
                 "airesvsg/acf-to-rest-api": "<=3.1",
                 "akaunting/akaunting": "<2.1.13",
@@ -2802,6 +2828,7 @@
                 "bmarshall511/wordpress_zero_spam": "<5.2.13",
                 "bolt/bolt": "<3.7.2",
                 "bolt/core": "<=4.2",
+                "born05/craft-twofactorauthentication": "<3.3.4",
                 "bottelet/flarepoint": "<2.2.1",
                 "bref/bref": "<2.1.17",
                 "brightlocal/phpwhois": "<=4.2.5",
@@ -2833,7 +2860,7 @@
                 "codeigniter4/framework": "<4.4.7",
                 "codeigniter4/shield": "<1.0.0.0-beta8",
                 "codiad/codiad": "<=2.8.4",
-                "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7",
+                "composer/composer": "<1.10.27|>=2,<2.2.24|>=2.3,<2.7.7",
                 "concrete5/concrete5": "<9.2.8",
                 "concrete5/core": "<8.5.8|>=9,<9.1",
                 "contao-components/mediaelement": ">=2.14.2,<2.21.1",
@@ -2870,7 +2897,7 @@
                 "doctrine/mongodb-odm": "<1.0.2",
                 "doctrine/mongodb-odm-bundle": "<3.0.1",
                 "doctrine/orm": ">=1,<1.2.4|>=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
-                "dolibarr/dolibarr": "<=19",
+                "dolibarr/dolibarr": "<19.0.2",
                 "dompdf/dompdf": "<2.0.4",
                 "doublethreedigital/guest-entries": "<3.1.2",
                 "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2",
@@ -2953,7 +2980,7 @@
                 "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3",
                 "gaoming13/wechat-php-sdk": "<=1.10.2",
                 "genix/cms": "<=1.1.11",
-                "getformwork/formwork": "<1.13",
+                "getformwork/formwork": "<1.13.1|==2.0.0.0-beta1",
                 "getgrav/grav": "<1.7.46",
                 "getkirby/cms": "<4.1.1",
                 "getkirby/kirby": "<=2.5.12",
@@ -2967,7 +2994,7 @@
                 "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
                 "gree/jose": "<2.2.1",
                 "gregwar/rst": "<1.0.3",
-                "grumpydictator/firefly-iii": "<6.1.7",
+                "grumpydictator/firefly-iii": "<6.1.17",
                 "gugoan/economizzer": "<=0.9.0.0-beta1",
                 "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
                 "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5",
@@ -3061,7 +3088,7 @@
                 "lms/routes": "<2.1.1",
                 "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
                 "luyadev/yii-helpers": "<1.2.1",
-                "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5",
+                "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch8|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch6|==2.4.7",
                 "magento/core": "<=1.9.4.5",
                 "magento/magento1ce": "<1.9.4.3-dev",
                 "magento/magento1ee": ">=1,<1.14.4.3-dev",
@@ -3094,7 +3121,7 @@
                 "mojo42/jirafeau": "<4.4",
                 "mongodb/mongodb": ">=1,<1.9.2",
                 "monolog/monolog": ">=1.8,<1.12",
-                "moodle/moodle": "<=4.3.3",
+                "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1",
                 "mos/cimage": "<0.7.19",
                 "movim/moxl": ">=0.8,<=0.10",
                 "movingbytes/social-network": "<=1.2.1",
@@ -3189,13 +3216,13 @@
                 "phpxmlrpc/extras": "<0.6.1",
                 "phpxmlrpc/phpxmlrpc": "<4.9.2",
                 "pi/pi": "<=2.5",
-                "pimcore/admin-ui-classic-bundle": "<1.3.4",
+                "pimcore/admin-ui-classic-bundle": "<=1.4.2",
                 "pimcore/customer-management-framework-bundle": "<4.0.6",
                 "pimcore/data-hub": "<1.2.4",
                 "pimcore/demo": "<10.3",
                 "pimcore/ecommerce-framework-bundle": "<1.0.10",
                 "pimcore/perspective-editor": "<1.5.1",
-                "pimcore/pimcore": "<11.1.6.5-dev|>=11.2,<11.2.3",
+                "pimcore/pimcore": "<11.2.4",
                 "pixelfed/pixelfed": "<0.11.11",
                 "plotly/plotly.js": "<2.25.2",
                 "pocketmine/bedrock-protocol": "<8.0.2",
@@ -3287,7 +3314,7 @@
                 "slim/slim": "<2.6",
                 "slub/slub-events": "<3.0.3",
                 "smarty/smarty": "<4.5.3|>=5,<5.1.1",
-                "snipe/snipe-it": "<=6.2.2",
+                "snipe/snipe-it": "<6.4.2",
                 "socalnick/scn-social-auth": "<1.15.2",
                 "socialiteproviders/steam": "<1.1",
                 "spatie/browsershot": "<3.57.4",
@@ -3302,6 +3329,7 @@
                 "studio-42/elfinder": "<2.1.62",
                 "subhh/libconnect": "<7.0.8|>=8,<8.1",
                 "sukohi/surpass": "<1",
+                "sulu/form-bundle": ">=2,<2.5.3",
                 "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13",
                 "sumocoders/framework-user-bundle": "<1.4",
                 "superbig/craft-audit": "<3.0.2",
@@ -3428,7 +3456,7 @@
                 "winter/wn-dusk-plugin": "<2.1",
                 "winter/wn-system-module": "<1.2.4",
                 "wintercms/winter": "<=1.2.3",
-                "woocommerce/woocommerce": "<6.6",
+                "woocommerce/woocommerce": "<6.6|>=8.8,<8.8.5|>=8.9,<8.9.3",
                 "wp-cli/wp-cli": ">=0.12,<2.5",
                 "wp-graphql/wp-graphql": "<=1.14.5",
                 "wp-premium/gravityforms": "<2.4.21",
@@ -3471,7 +3499,7 @@
                 "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3",
                 "zendframework/zend-mail": "<2.4.11|>=2.5,<2.7.2",
                 "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1",
-                "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4",
+                "zendframework/zend-session": ">=2,<2.2.9|>=2.3,<2.3.4",
                 "zendframework/zend-validator": ">=2.3,<2.3.6",
                 "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1",
                 "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6",
@@ -3530,7 +3558,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-03T21:04:39+00:00"
+            "time": "2024-06-18T22:04:21+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -4143,7 +4171,7 @@
         },
         {
             "name": "wp-phpunit/wp-phpunit",
-            "version": "6.5.3",
+            "version": "6.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-phpunit/wp-phpunit.git",
@@ -4215,5 +4243,5 @@
     "platform-overrides": {
         "php": "7.3.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/package-lock.json b/package-lock.json
index 33cf2aaf6..e3f54d7ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,24 +1,24 @@
 {
     "name": "bluehost-wordpress-plugin",
-    "version": "3.11.0",
+    "version": "3.12.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "bluehost-wordpress-plugin",
-            "version": "3.11.0",
+            "version": "3.12.0",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "@heroicons/react": "^2.1.1",
-                "@newfold-labs/wp-module-ecommerce": "^1.3.31",
+                "@newfold-labs/wp-module-ecommerce": "^1.3.33",
                 "@newfold-labs/wp-module-facebook": "1.0.7",
                 "@newfold-labs/wp-module-runtime": "^1.0.10",
                 "@newfold/ui-component-library": "^1.1.0",
                 "@reduxjs/toolkit": "^2.2.5",
-                "@wordpress/compose": "^6.35.0",
-                "@wordpress/dom-ready": "^3.58.0",
-                "@wordpress/element": "^5.35.0",
-                "@wordpress/html-entities": "^3.58.0",
+                "@wordpress/compose": "^7.1.0",
+                "@wordpress/dom-ready": "^4.1.0",
+                "@wordpress/element": "^6.1.0",
+                "@wordpress/html-entities": "^4.1.0",
                 "@wordpress/i18n": "^4.58.0",
                 "@wordpress/icons": "^9.49.0",
                 "classnames": "^2.5.1",
@@ -32,11 +32,11 @@
             },
             "devDependencies": {
                 "@tailwindcss/forms": "^0.5.7",
-                "@testing-library/cypress": "^10.0.1",
+                "@testing-library/cypress": "^10.0.2",
                 "@wordpress/env": "^9.10.0",
                 "@wordpress/eslint-plugin": "^18.1.0",
                 "@wordpress/scripts": "^27.4.0",
-                "cypress": "^13.7.0",
+                "cypress": "^13.12.0",
                 "cypress-axe": "^1.5.0",
                 "eslint-import-resolver-alias": "^1.1.2",
                 "eslint-plugin-import": "^2.29.1",
@@ -3197,9 +3197,9 @@
             }
         },
         "node_modules/@newfold-labs/wp-module-ecommerce": {
-            "version": "1.3.31",
-            "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.31/355c4a15cc4d8cc4820a8db6de508e511d938c42",
-            "integrity": "sha512-3T9MPz9v/dtyUuO0TAlJONhunZ2SNGbHCOuYKx7ffge6esO6wYFYB2m9B7FoP1wC8Rl/zvfwxQfKTooS6LHLHA==",
+            "version": "1.3.33",
+            "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.33/5b3282eb4b7afb48ff4dd45c358dd66b049bca9d",
+            "integrity": "sha512-XRiXm7bG4TW8cGaoTPcMSWSQ0o9t7YBiZZTTsKMBAnbIQwc5qkQGdrrSvb2bMzyuEXUYIbtxA+mJpCuO6defJw==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "@faizaanceg/pandora": "^1.1.1",
@@ -3241,6 +3241,24 @@
                 }
             }
         },
+        "node_modules/@newfold-labs/wp-module-ecommerce/node_modules/@wordpress/element": {
+            "version": "5.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
+            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/react": "^18.2.79",
+                "@types/react-dom": "^18.2.25",
+                "@wordpress/escape-html": "^2.58.0",
+                "change-case": "^4.1.2",
+                "is-plain-object": "^5.0.0",
+                "react": "^18.3.0",
+                "react-dom": "^18.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@newfold-labs/wp-module-facebook": {
             "version": "1.0.7",
             "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-facebook/1.0.7/47dab055e53ab8134c19943d7a60b677b9c940b6",
@@ -4184,13 +4202,13 @@
             }
         },
         "node_modules/@testing-library/cypress": {
-            "version": "10.0.1",
-            "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-10.0.1.tgz",
-            "integrity": "sha512-e8uswjTZIBhaIXjzEcrQQ8nHRWHgZH7XBxKuIWxZ/T7FxfWhCR48nFhUX5nfPizjVOKSThEfOSv67jquc1ASkw==",
+            "version": "10.0.2",
+            "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-10.0.2.tgz",
+            "integrity": "sha512-dKv95Bre5fDmNb9tOIuWedhGUryxGu1GWYWtXDqUsDPcr9Ekld0fiTb+pcBvSsFpYXAZSpmyEjhoXzLbhh06yQ==",
             "dev": true,
             "dependencies": {
                 "@babel/runtime": "^7.14.6",
-                "@testing-library/dom": "^9.0.0"
+                "@testing-library/dom": "^10.1.0"
             },
             "engines": {
                 "node": ">=12",
@@ -4201,22 +4219,22 @@
             }
         },
         "node_modules/@testing-library/dom": {
-            "version": "9.3.4",
-            "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz",
-            "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.1.0.tgz",
+            "integrity": "sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==",
             "dev": true,
             "dependencies": {
                 "@babel/code-frame": "^7.10.4",
                 "@babel/runtime": "^7.12.5",
                 "@types/aria-query": "^5.0.1",
-                "aria-query": "5.1.3",
+                "aria-query": "5.3.0",
                 "chalk": "^4.1.0",
                 "dom-accessibility-api": "^0.5.9",
                 "lz-string": "^1.5.0",
                 "pretty-format": "^27.0.2"
             },
             "engines": {
-                "node": ">=14"
+                "node": ">=18"
             }
         },
         "node_modules/@tootallnate/once": {
@@ -5204,6 +5222,17 @@
                 "node": ">=12"
             }
         },
+        "node_modules/@wordpress/a11y/node_modules/@wordpress/dom-ready": {
+            "version": "3.58.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.58.0.tgz",
+            "integrity": "sha512-sDgRPjNBToRKgYrpwvMRv2Yc7/17+sp8hm/rRnbubwb+d/DbGkK4Tc/r4sNLSZCqUAtcBXq9uk1lzvhge3QUSg==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@wordpress/api-fetch": {
             "version": "6.54.0",
             "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.54.0.tgz",
@@ -5340,7 +5369,7 @@
                 "react-dom": "^18.0.0"
             }
         },
-        "node_modules/@wordpress/compose": {
+        "node_modules/@wordpress/components/node_modules/@wordpress/compose": {
             "version": "6.35.0",
             "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-6.35.0.tgz",
             "integrity": "sha512-PfruhCxxxJokDQHc2YBgerEiHV7BIxQk9g5vU4/f9X/0PBQWUTuxOzSFcAba03vnjfAgtPTSMp50T50hcJwXfA==",
@@ -5366,6 +5395,170 @@
                 "react": "^18.0.0"
             }
         },
+        "node_modules/@wordpress/components/node_modules/@wordpress/element": {
+            "version": "5.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
+            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/react": "^18.2.79",
+                "@types/react-dom": "^18.2.25",
+                "@wordpress/escape-html": "^2.58.0",
+                "change-case": "^4.1.2",
+                "is-plain-object": "^5.0.0",
+                "react": "^18.3.0",
+                "react-dom": "^18.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@wordpress/components/node_modules/@wordpress/html-entities": {
+            "version": "3.58.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.58.0.tgz",
+            "integrity": "sha512-FU7b6QZdwTCuLKq6wCl0IZqqOMcMRxMcekVVytzTse7hYk9dvL1qQL/U4eQ/CNyKqiT9u7fb5NKTQILOzoolVQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@wordpress/components/node_modules/@wordpress/undo-manager": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-0.18.0.tgz",
+            "integrity": "sha512-upbzPEToa095XG+2JXLHaolF1LfXEMFS0lNMYV37myoUS+eZ7/tl9Gx+yU2+OqWy57TMwx33NlWUX/n+ynzPRw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/is-shallow-equal": "^4.58.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@wordpress/compose": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-7.1.0.tgz",
+            "integrity": "sha512-YxH191innNfsCzloxPLhxJh98avjMqYKH8as9srXqy6alN6QDQX7t4JYqT3+vjgRpJPwfzW7aBP2IO+u0cAz2w==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/mousetrap": "^1.6.8",
+                "@wordpress/deprecated": "^4.1.0",
+                "@wordpress/dom": "^4.1.0",
+                "@wordpress/element": "^6.1.0",
+                "@wordpress/is-shallow-equal": "^5.1.0",
+                "@wordpress/keycodes": "^4.1.0",
+                "@wordpress/priority-queue": "^3.1.0",
+                "@wordpress/undo-manager": "^1.1.0",
+                "change-case": "^4.1.2",
+                "clipboard": "^2.0.11",
+                "mousetrap": "^1.6.5",
+                "use-memo-one": "^1.1.1"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            },
+            "peerDependencies": {
+                "react": "^18.0.0"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/deprecated": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-4.1.0.tgz",
+            "integrity": "sha512-iZ/Vmhf3Tkq03DIuyef/+ZXsQanCZJsUc8xFPFXKn4ACHeo6Ds0krfFZ/AC0qwpW+cnHCaIEdqoEosHUnemGsQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/hooks": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/dom": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-4.1.0.tgz",
+            "integrity": "sha512-G3RhtPkuOLy/q46W4PWC5hMPX7Y7Gn7MLzbmOi1M5z0xUIWJWKXaxXx1hm6qgmRokY/Z8yRHl/PqEGe/UQIV6w==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/deprecated": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/hooks": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.1.0.tgz",
+            "integrity": "sha512-uJ2zyLLs6AwWuEdLGv/P7oSXJuX27Ym6JglzWGBavxAKNXpTCCjiJwgxlZJbSjT3BzhRsRGl3bUMmzt3eh50Pg==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/i18n": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.1.0.tgz",
+            "integrity": "sha512-zNJiudByLnpIVhIS45hr92r53t+wRYp9a6XOJ585xNYeUmoUpymY5GTdLSrExmQaytMhV5cSXSn3qMMDBMjUsg==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/hooks": "^4.1.0",
+                "gettext-parser": "^1.3.1",
+                "memize": "^2.1.0",
+                "sprintf-js": "^1.1.1",
+                "tannin": "^1.2.0"
+            },
+            "bin": {
+                "pot-to-php": "tools/pot-to-php.js"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/is-shallow-equal": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.1.0.tgz",
+            "integrity": "sha512-OZH/p43ZNJaSF40oi6dNdlsLqxjd4pZ1H4QxDg46vXT0TztU1rT/HOeJWyVmHIjx/4utuGaLJBZcfK4cKPQXUg==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/keycodes": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.1.0.tgz",
+            "integrity": "sha512-ibAR7qg4q7082s9kOPnZ0Hqb6KM/zjAZBjEH2Yrc2jwLJ83QDGKDWCSx6dNYkN7m9jGpH52w8j4nz1wcbFZSiw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/i18n": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/compose/node_modules/@wordpress/priority-queue": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-3.1.0.tgz",
+            "integrity": "sha512-soJddzCToRuF5ofayRUo0YYeJ9KZLM7ROzwwKIANOEcDt8+hnFRGmGorpfHYiDSThI4PtNqy6PdMOSy5/hvbFw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "requestidlecallback": "^0.3.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
         "node_modules/@wordpress/data": {
             "version": "9.27.0",
             "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-9.27.0.tgz",
@@ -5394,6 +5587,62 @@
                 "react": "^18.0.0"
             }
         },
+        "node_modules/@wordpress/data/node_modules/@wordpress/compose": {
+            "version": "6.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-6.35.0.tgz",
+            "integrity": "sha512-PfruhCxxxJokDQHc2YBgerEiHV7BIxQk9g5vU4/f9X/0PBQWUTuxOzSFcAba03vnjfAgtPTSMp50T50hcJwXfA==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/mousetrap": "^1.6.8",
+                "@wordpress/deprecated": "^3.58.0",
+                "@wordpress/dom": "^3.58.0",
+                "@wordpress/element": "^5.35.0",
+                "@wordpress/is-shallow-equal": "^4.58.0",
+                "@wordpress/keycodes": "^3.58.0",
+                "@wordpress/priority-queue": "^2.58.0",
+                "@wordpress/undo-manager": "^0.18.0",
+                "change-case": "^4.1.2",
+                "clipboard": "^2.0.11",
+                "mousetrap": "^1.6.5",
+                "use-memo-one": "^1.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "react": "^18.0.0"
+            }
+        },
+        "node_modules/@wordpress/data/node_modules/@wordpress/element": {
+            "version": "5.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
+            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/react": "^18.2.79",
+                "@types/react-dom": "^18.2.25",
+                "@wordpress/escape-html": "^2.58.0",
+                "change-case": "^4.1.2",
+                "is-plain-object": "^5.0.0",
+                "react": "^18.3.0",
+                "react-dom": "^18.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@wordpress/data/node_modules/@wordpress/undo-manager": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-0.18.0.tgz",
+            "integrity": "sha512-upbzPEToa095XG+2JXLHaolF1LfXEMFS0lNMYV37myoUS+eZ7/tl9Gx+yU2+OqWy57TMwx33NlWUX/n+ynzPRw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/is-shallow-equal": "^4.58.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@wordpress/data/node_modules/redux": {
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
@@ -5457,14 +5706,15 @@
             }
         },
         "node_modules/@wordpress/dom-ready": {
-            "version": "3.58.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.58.0.tgz",
-            "integrity": "sha512-sDgRPjNBToRKgYrpwvMRv2Yc7/17+sp8hm/rRnbubwb+d/DbGkK4Tc/r4sNLSZCqUAtcBXq9uk1lzvhge3QUSg==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-4.1.0.tgz",
+            "integrity": "sha512-FxlhDPGpe29rWLph3GpkQUG3sRSNRxji871S9+DviE4zt/872rKe6caum1QptsJN8rcn/hm+HIOS7qrYFjS2Xg==",
             "dependencies": {
                 "@babel/runtime": "^7.16.0"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
             }
         },
         "node_modules/@wordpress/e2e-test-utils-playwright": {
@@ -5506,21 +5756,34 @@
             }
         },
         "node_modules/@wordpress/element": {
-            "version": "5.35.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
-            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-6.1.0.tgz",
+            "integrity": "sha512-DqAGqal1i6gTfYxz95zHnckbweS43MroHqMcz/Rww60pysTCoaRG5KZ/v4/3hry1tNCem1WQguY4ZMTF0MMTBQ==",
             "dependencies": {
                 "@babel/runtime": "^7.16.0",
                 "@types/react": "^18.2.79",
                 "@types/react-dom": "^18.2.25",
-                "@wordpress/escape-html": "^2.58.0",
+                "@wordpress/escape-html": "^3.1.0",
                 "change-case": "^4.1.2",
                 "is-plain-object": "^5.0.0",
                 "react": "^18.3.0",
                 "react-dom": "^18.3.0"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/element/node_modules/@wordpress/escape-html": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-3.1.0.tgz",
+            "integrity": "sha512-wcRGrGuGV4kTd5hJMXy/bdjCObqcwqFmd/HkDAUi2pfngEsv2aJhAeTfkGP5NwmY/F03Oqz2Qgd4UzTiIu2bjQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
             }
         },
         "node_modules/@wordpress/env": {
@@ -5612,14 +5875,15 @@
             }
         },
         "node_modules/@wordpress/html-entities": {
-            "version": "3.58.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.58.0.tgz",
-            "integrity": "sha512-FU7b6QZdwTCuLKq6wCl0IZqqOMcMRxMcekVVytzTse7hYk9dvL1qQL/U4eQ/CNyKqiT9u7fb5NKTQILOzoolVQ==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.1.0.tgz",
+            "integrity": "sha512-9VXyZy99hZwkBK8p8p4bOo7oGOhyLlaVPoIX2D/bspcSh1r58CPXkHq8jK/+uqE8ihLs+WnW21Lud8qe0tg4Bw==",
             "dependencies": {
                 "@babel/runtime": "^7.16.0"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
             }
         },
         "node_modules/@wordpress/i18n": {
@@ -5654,6 +5918,24 @@
                 "node": ">=12"
             }
         },
+        "node_modules/@wordpress/icons/node_modules/@wordpress/element": {
+            "version": "5.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
+            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/react": "^18.2.79",
+                "@types/react-dom": "^18.2.25",
+                "@wordpress/escape-html": "^2.58.0",
+                "change-case": "^4.1.2",
+                "is-plain-object": "^5.0.0",
+                "react": "^18.3.0",
+                "react-dom": "^18.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@wordpress/is-shallow-equal": {
             "version": "4.58.0",
             "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.58.0.tgz",
@@ -5767,6 +6049,24 @@
                 "node": ">=12"
             }
         },
+        "node_modules/@wordpress/primitives/node_modules/@wordpress/element": {
+            "version": "5.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
+            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/react": "^18.2.79",
+                "@types/react-dom": "^18.2.25",
+                "@wordpress/escape-html": "^2.58.0",
+                "change-case": "^4.1.2",
+                "is-plain-object": "^5.0.0",
+                "react": "^18.3.0",
+                "react-dom": "^18.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@wordpress/priority-queue": {
             "version": "2.58.0",
             "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.58.0.tgz",
@@ -5830,6 +6130,62 @@
                 "react": "^18.0.0"
             }
         },
+        "node_modules/@wordpress/rich-text/node_modules/@wordpress/compose": {
+            "version": "6.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-6.35.0.tgz",
+            "integrity": "sha512-PfruhCxxxJokDQHc2YBgerEiHV7BIxQk9g5vU4/f9X/0PBQWUTuxOzSFcAba03vnjfAgtPTSMp50T50hcJwXfA==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/mousetrap": "^1.6.8",
+                "@wordpress/deprecated": "^3.58.0",
+                "@wordpress/dom": "^3.58.0",
+                "@wordpress/element": "^5.35.0",
+                "@wordpress/is-shallow-equal": "^4.58.0",
+                "@wordpress/keycodes": "^3.58.0",
+                "@wordpress/priority-queue": "^2.58.0",
+                "@wordpress/undo-manager": "^0.18.0",
+                "change-case": "^4.1.2",
+                "clipboard": "^2.0.11",
+                "mousetrap": "^1.6.5",
+                "use-memo-one": "^1.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "react": "^18.0.0"
+            }
+        },
+        "node_modules/@wordpress/rich-text/node_modules/@wordpress/element": {
+            "version": "5.35.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.35.0.tgz",
+            "integrity": "sha512-puswpGcIdS+0A2g28uHriMkZqqRCmzFczue5Tk99VNtzBdehyk7Ae+DZ4xw5yT6GqYai8NTqv6MRwCB78uh5Mw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@types/react": "^18.2.79",
+                "@types/react-dom": "^18.2.25",
+                "@wordpress/escape-html": "^2.58.0",
+                "change-case": "^4.1.2",
+                "is-plain-object": "^5.0.0",
+                "react": "^18.3.0",
+                "react-dom": "^18.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@wordpress/rich-text/node_modules/@wordpress/undo-manager": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-0.18.0.tgz",
+            "integrity": "sha512-upbzPEToa095XG+2JXLHaolF1LfXEMFS0lNMYV37myoUS+eZ7/tl9Gx+yU2+OqWy57TMwx33NlWUX/n+ynzPRw==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0",
+                "@wordpress/is-shallow-equal": "^4.58.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@wordpress/scripts": {
             "version": "27.8.0",
             "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-27.8.0.tgz",
@@ -5926,15 +6282,28 @@
             }
         },
         "node_modules/@wordpress/undo-manager": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-0.18.0.tgz",
-            "integrity": "sha512-upbzPEToa095XG+2JXLHaolF1LfXEMFS0lNMYV37myoUS+eZ7/tl9Gx+yU2+OqWy57TMwx33NlWUX/n+ynzPRw==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-1.1.0.tgz",
+            "integrity": "sha512-9n+tSxWomyfvGhCWA2fevIgP8/sLcMX3kwdBAwr3PQJ/EbOoamFh7BLMRbSk2oKfXaPSwk8aN4QE92BQpYnL5g==",
             "dependencies": {
                 "@babel/runtime": "^7.16.0",
-                "@wordpress/is-shallow-equal": "^4.58.0"
+                "@wordpress/is-shallow-equal": "^5.1.0"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
+            }
+        },
+        "node_modules/@wordpress/undo-manager/node_modules/@wordpress/is-shallow-equal": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.1.0.tgz",
+            "integrity": "sha512-OZH/p43ZNJaSF40oi6dNdlsLqxjd4pZ1H4QxDg46vXT0TztU1rT/HOeJWyVmHIjx/4utuGaLJBZcfK4cKPQXUg==",
+            "dependencies": {
+                "@babel/runtime": "^7.16.0"
+            },
+            "engines": {
+                "node": ">=18.12.0",
+                "npm": ">=8.19.2"
             }
         },
         "node_modules/@wordpress/url": {
@@ -6297,12 +6666,12 @@
             "dev": true
         },
         "node_modules/aria-query": {
-            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-            "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+            "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
             "dev": true,
             "dependencies": {
-                "deep-equal": "^2.0.5"
+                "dequal": "^2.0.3"
             }
         },
         "node_modules/arr-union": {
@@ -8548,12 +8917,11 @@
             }
         },
         "node_modules/cypress": {
-            "version": "13.9.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.9.0.tgz",
-            "integrity": "sha512-atNjmYfHsvTuCaxTxLZr9xGoHz53LLui3266WWxXJHY7+N6OdwJdg/feEa3T+buez9dmUXHT1izCOklqG82uCQ==",
+            "version": "13.12.0",
+            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.12.0.tgz",
+            "integrity": "sha512-udzS2JilmI9ApO/UuqurEwOvThclin5ntz7K0BtnHBs+tg2Bl9QShLISXpSEMDv/u8b6mqdoAdyKeZiSqKWL8g==",
             "dev": true,
             "hasInstallScript": true,
-            "license": "MIT",
             "dependencies": {
                 "@cypress/request": "^3.0.0",
                 "@cypress/xvfb": "^1.2.4",
@@ -8863,38 +9231,6 @@
                 }
             }
         },
-        "node_modules/deep-equal": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
-            "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
-            "dev": true,
-            "dependencies": {
-                "array-buffer-byte-length": "^1.0.0",
-                "call-bind": "^1.0.5",
-                "es-get-iterator": "^1.1.3",
-                "get-intrinsic": "^1.2.2",
-                "is-arguments": "^1.1.1",
-                "is-array-buffer": "^3.0.2",
-                "is-date-object": "^1.0.5",
-                "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
-                "isarray": "^2.0.5",
-                "object-is": "^1.1.5",
-                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.4",
-                "regexp.prototype.flags": "^1.5.1",
-                "side-channel": "^1.0.4",
-                "which-boxed-primitive": "^1.0.2",
-                "which-collection": "^1.0.1",
-                "which-typed-array": "^1.1.13"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/deep-extend": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -9659,26 +9995,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/es-get-iterator": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-            "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.3",
-                "has-symbols": "^1.0.3",
-                "is-arguments": "^1.1.1",
-                "is-map": "^2.0.2",
-                "is-set": "^2.0.2",
-                "is-string": "^1.0.7",
-                "isarray": "^2.0.5",
-                "stop-iteration-iterator": "^1.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/es-iterator-helpers": {
             "version": "1.0.19",
             "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
@@ -10217,15 +10533,6 @@
                 "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
             }
         },
-        "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-            "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-            "dev": true,
-            "dependencies": {
-                "dequal": "^2.0.3"
-            }
-        },
         "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -12742,22 +13049,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/is-arguments": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-            "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/is-array-buffer": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
@@ -16337,22 +16628,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/object-is": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-            "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.7",
-                "define-properties": "^1.2.1"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/object-keys": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -19944,18 +20219,6 @@
                 "node": ">= 0.8"
             }
         },
-        "node_modules/stop-iteration-iterator": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-            "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-            "dev": true,
-            "dependencies": {
-                "internal-slot": "^1.0.4"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
         "node_modules/streamx": {
             "version": "2.16.1",
             "dev": true,
diff --git a/package.json b/package.json
index 25b6723e5..ab55cca54 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bluehost-wordpress-plugin",
-    "version": "3.11.0",
+    "version": "3.12.0",
     "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.",
     "author": {
         "name": "Bluehost",
@@ -33,15 +33,15 @@
     },
     "dependencies": {
         "@heroicons/react": "^2.1.1",
-        "@newfold-labs/wp-module-ecommerce": "^1.3.31",
+        "@newfold-labs/wp-module-ecommerce": "^1.3.33",
         "@newfold-labs/wp-module-facebook": "1.0.7",
         "@newfold-labs/wp-module-runtime": "^1.0.10",
         "@newfold/ui-component-library": "^1.1.0",
         "@reduxjs/toolkit": "^2.2.5",
-        "@wordpress/compose": "^6.35.0",
-        "@wordpress/dom-ready": "^3.58.0",
-        "@wordpress/element": "^5.35.0",
-        "@wordpress/html-entities": "^3.58.0",
+        "@wordpress/compose": "^7.1.0",
+        "@wordpress/dom-ready": "^4.1.0",
+        "@wordpress/element": "^6.1.0",
+        "@wordpress/html-entities": "^4.1.0",
         "@wordpress/i18n": "^4.58.0",
         "@wordpress/icons": "^9.49.0",
         "classnames": "^2.5.1",
@@ -55,11 +55,11 @@
     },
     "devDependencies": {
         "@tailwindcss/forms": "^0.5.7",
-        "@testing-library/cypress": "^10.0.1",
+        "@testing-library/cypress": "^10.0.2",
         "@wordpress/env": "^9.10.0",
         "@wordpress/eslint-plugin": "^18.1.0",
         "@wordpress/scripts": "^27.4.0",
-        "cypress": "^13.7.0",
+        "cypress": "^13.12.0",
         "cypress-axe": "^1.5.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-import": "^2.29.1",
diff --git a/src/app/pages/marketplace/index.js b/src/app/pages/marketplace/index.js
index 02e8cf6f6..a920acd52 100644
--- a/src/app/pages/marketplace/index.js
+++ b/src/app/pages/marketplace/index.js
@@ -1,11 +1,11 @@
 import apiFetch from '@wordpress/api-fetch';
 import { useState, useEffect } from '@wordpress/element';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useMatch, useNavigate } from 'react-router-dom';
 import classnames from 'classnames';
 import { Container, Page } from '@newfold/ui-component-library';
 import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
 // component sourced from marketplace module
-import { default as NewfoldMarketplace } from '@modules/wp-module-marketplace/components/marketplace/';
+import { default as NewfoldMarketplace } from '@modules/wp-module-marketplace/components/';
 
 const MarketplacePage = () => {
 	// constants to pass to module
@@ -26,6 +26,18 @@ const MarketplacePage = () => {
 				'bluehost-wordpress-plugin'
 			),
 			loadMore: __( 'Load More', 'bluehost-wordpress-plugin' ),
+			productPage: {
+				error: {
+					title: __(
+						'Oops! Something Went Wrong',
+						'bluehost-wordpress-plugin'
+					),
+					description: __(
+						'An error occurred while loading the content. Please try again later.',
+						'bluehost-wordpress-plugin'
+					),
+				},
+			},
 		},
 	};
 
@@ -36,12 +48,18 @@ const MarketplacePage = () => {
 		useState,
 		useEffect,
 		useLocation,
+		useMatch,
+		useNavigate,
 		NewfoldRuntime,
 	};
 
 	return (
 		<Page className={ 'wppbh-app-marketplace-page' }>
-			<Container className={ 'wppbh-app-marketplace-container' }>
+			<Container
+				className={
+					'wppbh-app-marketplace-container nfd-overflow-clip'
+				}
+			>
 				<NewfoldMarketplace
 					methods={ moduleMethods }
 					constants={ moduleConstants }
diff --git a/src/app/pages/settings/socialMediaAccounts.js b/src/app/pages/settings/socialMediaAccounts.js
index 36369c30c..b4c6f203a 100644
--- a/src/app/pages/settings/socialMediaAccounts.js
+++ b/src/app/pages/settings/socialMediaAccounts.js
@@ -15,8 +15,11 @@ const SocialMediaAccounts = () => {
 	const getFbDetails = () => {
 		getFacebookUserProfileDetails().then( ( res ) => {
 			setFbLogin( res === 'token not found!' ? false : true );
-			if ( Array.isArray( res ) ) setLoginInfo( res[ 0 ] );
-			else setLoginInfo( res );
+			if ( Array.isArray( res ) ) {
+				setLoginInfo( res[ 0 ] );
+			} else {
+				setLoginInfo( res );
+			}
 		} );
 	};