diff --git a/src/components/products/product-subscribe/react/runtime/ProductSubscribeForm.tsx b/src/components/products/product-subscribe/react/runtime/ProductSubscribeForm.tsx
index 14a4fadca..17e96ce1a 100644
--- a/src/components/products/product-subscribe/react/runtime/ProductSubscribeForm.tsx
+++ b/src/components/products/product-subscribe/react/runtime/ProductSubscribeForm.tsx
@@ -27,7 +27,7 @@ export const ProductSubscribeForm = ({ subscribe, termsOfUse, showTermsByDefault
                 tokens={{ childrenGap: 15 }}
                 className="form-group"
             >
-                <Stack.Item>
+                <Stack.Item className="form-inline">
                     <input
                         value={subscriptionName}
                         onChange={(event) => setSubscriptionName(event.target.value)}
diff --git a/src/components/users/runtime/hip-captcha/react/NewCaptcha.tsx b/src/components/users/runtime/hip-captcha/react/NewCaptcha.tsx
index 6847574fb..cd919afe9 100644
--- a/src/components/users/runtime/hip-captcha/react/NewCaptcha.tsx
+++ b/src/components/users/runtime/hip-captcha/react/NewCaptcha.tsx
@@ -91,25 +91,27 @@ export const NewCaptcha = ({ backendService, onInitComplete }: TCaptchaProps) =>
                     <Tab icon={<Speaker2Regular />} value={ECaptchaType.audio}>Audio</Tab>
                 </TabList>
 
-                {working ? (
-                    <Stack.Item style={{ padding: "13px 0" }}>
-                        <Spinner label={"Loading captcha"} labelPosition="below" />
-                    </Stack.Item>
-                ) : captchaType === ECaptchaType.visual ? (
-                    <Stack.Item>
-                        <img
+                <div style={{ margin: "10px 0" }}>
+                    {working ? (
+                      <Stack.Item style={{ padding: "13px 0" }}>
+                          <Spinner style={{ display: "inline-flex" }} label={"Loading captcha"} labelPosition="below" />
+                      </Stack.Item>
+                    ) : captchaType === ECaptchaType.visual ? (
+                      <Stack.Item>
+                          <img
                             src={`data:image/png;base64,${captchaChallenge}`}
                             alt="visual challange"
-                        />
-                    </Stack.Item>
-                ) : (
-                    <audio controls>
-                        <source
+                          />
+                      </Stack.Item>
+                    ) : (
+                      <audio controls>
+                          <source
                             src={`data:audio/mp3;base64,${captchaChallenge}`}
                             type="audio/mp3"
-                        />
-                    </audio>
-                )}
+                          />
+                      </audio>
+                    )}
+                </div>
 
 
                 <Stack.Item>
diff --git a/src/components/users/signup/ko/runtime/signup.html b/src/components/users/signup/ko/runtime/signup.html
index 215eed2d1..2a6768d83 100644
--- a/src/components/users/signup/ko/runtime/signup.html
+++ b/src/components/users/signup/ko/runtime/signup.html
@@ -34,14 +34,14 @@
 
         <!-- ko if: requireHipCaptcha -->
         <hip-captcha params="{ captchaData: captchaData, onInitComplete: onCaptchaCreated }"></hip-captcha>
-        <!-- /ko -->       
-        
+        <!-- /ko -->
+
         <!-- ko if: termsEnabled && termsOfUse -->
         <terms-of-use params="{ isConsentRequired: isConsentRequired, consented: consented, termsOfUse: termsOfUse }"></terms-of-use>
         <!-- /ko -->
 
         <div class="form-group">
-            
+
             <!-- ko ifnot: working -->
             <button type="button" id="signup" class="button button-primary" data-bind="click: signup">
                 Sign up
diff --git a/src/themes/website/styles/widgets/widgets.scss b/src/themes/website/styles/widgets/widgets.scss
index 301ff28b5..b04e1d081 100644
--- a/src/themes/website/styles/widgets/widgets.scss
+++ b/src/themes/website/styles/widgets/widgets.scss
@@ -18,3 +18,31 @@
 @import "fui/operation-details.scss";
 @import "fui/apis-products-lists.scss";
 @import "fui/reports.scss";
+
+/**
+ * If you need to make sure that custom defined styles do not interfere with widgets,
+ * this is a good place to do it.
+ * Note: selector is duplicated to increase its weight. Do not use !important as it will break
+ * some widgets that rely on inline styles.
+ */
+.fui-FluentProvider.fui-FluentProvider.fui-FluentProvider {
+  .button {
+    margin: 10px 20px 10px 0;
+    padding: 9px 50px;
+  }
+
+  .form-group {
+    margin: 5px 10px 20px 0;
+    padding: 0;
+
+    label {
+      margin: 0 0 0.5em;
+      padding: 0;
+    }
+
+    .form-control {
+      margin: 0;
+      padding: 7px 10px 5px;
+    }
+  }
+}
diff --git a/webpack.publisher.js b/webpack.publisher.js
index 0c82f01a2..4fcc7651c 100644
--- a/webpack.publisher.js
+++ b/webpack.publisher.js
@@ -15,7 +15,7 @@ const publisherConfig = {
     },
     entry: {
         "index": ["./src/startup.publish.ts"]
-    },    
+    },
     output: {
         filename: "./[name].js",
         path: path.resolve(__dirname, "dist/publisher")