diff --git a/src/components/GeneralSettings.js b/src/components/GeneralSettings.js
index 4a9d7e89..fc9bed10 100644
--- a/src/components/GeneralSettings.js
+++ b/src/components/GeneralSettings.js
@@ -210,20 +210,24 @@ export function GeneralSettings(props) {
             onRequestClose={() => setOnboardingModal(null)}
           >
             <div className="nfd-ecommerce-modal-content">
-              <h1>We hit a snag...</h1>
+              <h1>Hold tight...</h1>
               <span style={{ marginTop: "48px" }}>
                 {onboardingModalKey == YithOptions.paypal
                   ? "Payment"
                   : "Shipping"}{" "}
-                support is being setup. Please check back in sometime.
+                support is still being setup. Please wait a few minutes and try
+                again.
               </span>
-              <span style={{ marginTop: "32px", height: "60px" }}>
+              <span style={{ marginTop: "32px" }}>
                 If the problem persists, please{" "}
                 <a href="https://www.bluehost.com/contact" target="_blank">
                   contact
                 </a>{" "}
                 the support team.
               </span>
+              <button onClick={() => setOnboardingModal(null)}>
+                Okay
+              </button>
             </div>
           </Modal>
         ) : (
diff --git a/src/components/StoreAddress.js b/src/components/StoreAddress.js
index 26c5189a..e9d639ef 100644
--- a/src/components/StoreAddress.js
+++ b/src/components/StoreAddress.js
@@ -59,7 +59,7 @@ export function StoreAddress({ onComplete, isMandatory = false }) {
       </p>
       <p className="nfd-ecommerce-modal-header-description">
         {__(
-          "Use the same address you provided for your Bluehost account or change it below:",
+          "We'll use this information to help you setup your online store",
           "wp-module-ecoomerce"
         )}
       </p>