diff --git a/composer.json b/composer.json
index d0e7677e9..d27d8ea31 100644
--- a/composer.json
+++ b/composer.json
@@ -34,13 +34,13 @@
         }
     },
     "require": {
+        "ext-iconv": "*",
         "bluehost/endurance-wp-module-business-reviews": "^1.0",
-        "bluehost/endurance-wp-module-gutenframe": "^0.1",
+        "bluehost/endurance-wp-module-gutenframe": "^0.1.3",
         "bluehost/endurance-wp-module-loader": "^1.0",
         "bluehost/endurance-wp-module-spam-prevention": "^1.0",
         "bluehost/endurance-wp-module-sso": "^1.0",
         "bluehost/endurance-wp-plugin-updater": "^1.0",
-        "ext-iconv": "*",
         "wpscholar/github-archive-installer": "^1.1"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index ceb0d26a4..2629b06fb 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": "0edf2ce49d0917ae1c4c8f91ea1d9195",
+    "content-hash": "571c4272e7e18cd5bdd96b51618a1c03",
     "packages": [
         {
             "name": "bluehost/endurance-wp-module-business-reviews",
@@ -44,16 +44,16 @@
         },
         {
             "name": "bluehost/endurance-wp-module-gutenframe",
-            "version": "0.1.2",
+            "version": "0.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bluehost/endurance-wp-module-gutenframe.git",
-                "reference": "5affb465c83dcb8b8c77203e257c852d3d5aa8a5"
+                "reference": "6e3041b1abcb725de78f6cdc4c9ec6e09c9fadb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bluehost/endurance-wp-module-gutenframe/zipball/5affb465c83dcb8b8c77203e257c852d3d5aa8a5",
-                "reference": "5affb465c83dcb8b8c77203e257c852d3d5aa8a5",
+                "url": "https://api.github.com/repos/bluehost/endurance-wp-module-gutenframe/zipball/6e3041b1abcb725de78f6cdc4c9ec6e09c9fadb9",
+                "reference": "6e3041b1abcb725de78f6cdc4c9ec6e09c9fadb9",
                 "shasum": ""
             },
             "require-dev": {
@@ -84,10 +84,10 @@
             ],
             "description": "A solution for forcing the Block Editor fullscreen and preparing it for <iframe>-ing.",
             "support": {
-                "source": "https://github.com/bluehost/endurance-wp-module-gutenframe/tree/0.1.2",
+                "source": "https://github.com/bluehost/endurance-wp-module-gutenframe/tree/0.1.3",
                 "issues": "https://github.com/bluehost/endurance-wp-module-gutenframe/issues"
             },
-            "time": "2019-08-06T17:50:12+00:00"
+            "time": "2020-08-25T18:36:43+00:00"
         },
         {
             "name": "bluehost/endurance-wp-module-loader",
@@ -429,16 +429,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.2.7",
+            "version": "1.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
+                "reference": "8a7ecad675253e4654ea05505233285377405215"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
-                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215",
+                "reference": "8a7ecad675253e4654ea05505233285377405215",
                 "shasum": ""
             },
             "require": {
@@ -486,12 +486,16 @@
                     "url": "https://packagist.com",
                     "type": "custom"
                 },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/composer/composer",
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-08T08:27:21+00:00"
+            "time": "2020-08-23T12:54:47+00:00"
         },
         {
             "name": "composer/composer",
@@ -1469,16 +1473,16 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.8.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd"
+                "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/3d5eb71705adfa34bd34b993400622932b2f62fd",
-                "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/590cfec960b77fd55e39b7d9246659e95dd6d337",
+                "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337",
                 "shasum": ""
             },
             "require": {
@@ -1524,7 +1528,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-08-13T09:07:59+00:00"
+            "time": "2020-08-25T06:56:57+00:00"
         },
         {
             "name": "seld/phar-utils",
diff --git a/src/app/components/atoms/bwa-button/index.js b/src/app/components/atoms/bwa-button/index.js
index 4387e1f76..de3739dc4 100644
--- a/src/app/components/atoms/bwa-button/index.js
+++ b/src/app/components/atoms/bwa-button/index.js
@@ -12,17 +12,18 @@ import { forwardRef } from '@wordpress/element';
  */
 import './style.scss';
 
-const BWAButton = forwardRef( ( { className = '', ...props }, ref = null ) => {
+const BWAButton = forwardRef((props, ref) => {
+	const {className = ''} = props;
 	return (
 		<Button
 			{ ...props }
-			className={ classNames( {
+			className={ classNames({
 				bluehost: true,
-				[ className ]: className.length,
-			} ) }
+				[className]: className.length,
+			}) }
 			ref={ ref }
 		/>
 	);
-} );
+});
 
 export default BWAButton;
diff --git a/src/app/components/organisms/bwa-header/mobile-sidebar/index.js b/src/app/components/organisms/bwa-header/mobile-sidebar/index.js
index aab8b44e3..855c12b91 100644
--- a/src/app/components/organisms/bwa-header/mobile-sidebar/index.js
+++ b/src/app/components/organisms/bwa-header/mobile-sidebar/index.js
@@ -53,7 +53,7 @@ const UserMenu = () => (
 	<ul className="user">
 		{ userMenuItems.map( ( item ) => (
 			<li className={ [ 'tab' ] } key={ item.href }>
-				<a href={ item.href } activeClassName="is-active">
+				<a href={ item.href } className="is-active">
 					<span className={ [ 'menu-item-icon is-svg-' + item.color ] }><item.icon /></span>
 					{ item.label }
 				</a>
diff --git a/src/app/components/organisms/bwa-header/style.scss b/src/app/components/organisms/bwa-header/style.scss
index ea06d703b..1c9d46677 100644
--- a/src/app/components/organisms/bwa-header/style.scss
+++ b/src/app/components/organisms/bwa-header/style.scss
@@ -64,7 +64,7 @@
   &:after {
     right: -20px;
   }
-} 
+}
 
 @media (min-width:$menu-breakpoint) {
   .bluehost-header {
@@ -96,10 +96,13 @@
     top: 100px;
     text-align: left;
     background-color: #fff;
-    box-shadow: 0 7px 14px 0 rgba(60, 66, 87, 0.1), 0 3px 6px 0 rgba(0, 0, 0, 0.07);
     z-index: 9999;
 }
 
+.components-popover__content {
+  box-shadow: 0 7px 14px 0 rgba(60, 66, 87, 0.1), 0 3px 6px 0 rgba(0, 0, 0, 0.07);
+}
+
 #bluehost-nav-popup-inner {
     padding: 8px 0;
     li:first-of-type a {
@@ -315,4 +318,4 @@
 // .bluehost-nav-popup::before,
 // .bluehost-nav-popup::after {
 //   margin-left: -22px !important;
-// }
\ No newline at end of file
+// }
diff --git a/src/app/components/organisms/bwa-header/user-menu.js b/src/app/components/organisms/bwa-header/user-menu.js
index b039769d5..5166c758a 100644
--- a/src/app/components/organisms/bwa-header/user-menu.js
+++ b/src/app/components/organisms/bwa-header/user-menu.js
@@ -44,7 +44,7 @@ export default [
 	},
 	{
 		icon: ValidationIcon,
-		href: '#',
+		href: 'https://my.bluehost.com/cgi/token',
 		label: __( 'Validation Token', 'bluehost-wordpress-plugin' ),
 		color: 'orange',
 	},