diff --git a/web-assets/auth0/dev-tenant/universal-login.html b/web-assets/auth0/dev-tenant/universal-login.html
index 10cf192..b05b627 100644
--- a/web-assets/auth0/dev-tenant/universal-login.html
+++ b/web-assets/auth0/dev-tenant/universal-login.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Sign In with Topcoder</title>
-       <link rel="shortcut icon" type="image/png" href="https://www.topcoder-dev.com/favicon.ico"/>
+    <link rel="shortcut icon" type="image/png" href="https://www.topcoder-dev.com/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap" rel="stylesheet">
@@ -64,7 +64,11 @@
 <script src="https://cdn.auth0.com/js/es5-shim.min.js"></script>
 <![endif]-->
 
+    <!-- <script src="https://tc-public-static-files.topcoder-dev.com/topcoder-auth/js/lock.min_v2.js"></script>
+     -->
     <script src="https://cdn.auth0.com/js/lock/11.30/lock.min.js"></script>
+    <!-- <script src="https://code.jquery.com/jquery-3.6.0.slim.min.js" integrity="sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=" crossorigin="anonymous"></script>
+   -->
     <script language="javascript" type="text/javascript"
         src="https://tc-public-static-files.topcoder.com/topcoder-auth/js/country.js"></script>
     <script>
@@ -110,7 +114,7 @@
                 title: 'Topcoder Login',
                 emailInputPlaceholder: 'Email',
                 passwordInputPlaceholder: 'Password',
-                signUpTerms: 'I agree to the <a href="https://www.topcoder.com/policy/privacy-policy" target="_new"">Privacy Policy</a> of Topcoder.<br/> By clicking "Sign up", you agree to the <a href="https://www.topcoder.com/policy/terms-and-conditions"  target="_new">Terms</a> of Topcoder.',
+                signUpTerms: 'Yes, I understand and agree to the <a href="https://www.topcoder.com/policy/privacy-policy" target="_new"">Privacy Policy</a> and <a href="https://www.topcoder.com/policy/terms-and-conditions"  target="_new">Terms</a> of Topcoder.',
                 signUpTitle: 'Join Topcoder',
                 signUpLabel: 'Sign Up',
                 signUpSubmitLabel: 'Sign Up',
@@ -118,7 +122,7 @@
                 loginLabel: 'Log In',
                 loginSubmitLabel: 'Log In',
                 loginWithLabel: '%s',
-                usernameInputPlaceholder: 'Username / Handle',
+                usernameInputPlaceholder: 'Create a Username / Handle',
                 usernameOrEmailInputPlaceholder: 'Username / Handle',
                 forgotPasswordAction: 'Forgot your password?'
             };
@@ -280,17 +284,10 @@
                     {
                         type: "select",
                         name: "country",
-                        placeholder: "Choose your country",
+                        placeholder: "Select your country (current location)",
                         options: optionsObj,
                         // The following properties are optional
                         prefill: "us"
-                    },
-                    {
-                        name: 'how_did_hear',
-                        placeholder: 'How did you hear about us?',
-                        validator: function () {
-                            return true;
-                        }
                     }
                 ]
             }
@@ -325,6 +322,26 @@
             var mediaQuery = window.matchMedia('(min-width: 1156px)');
             updateSignUp(regSource);
             mediaQuery.addListener(updateSignUp);
+            try {
+                const firstNameDiv =
+                    document.getElementById("1-firstName").parentNode.parentNode;
+                const lastNameDiv =
+                    document.getElementById("1-lastName").parentNode.parentNode;
+                const emailDiv = document.getElementById("1-email").parentNode.parentNode;
+                emailDiv.parentNode.insertBefore(firstNameDiv, emailDiv);
+                emailDiv.parentNode.insertBefore(lastNameDiv, emailDiv);
+                try {
+                    document.getElementsByName("password")[0].placeholder = "Create a Password";
+                    /*setTimeout(function() {
+                      document.getElementById("1-country").value = "Select your country (current location)"
+                    }, 300);*/
+                } catch (e) {
+                    console.log("Error occured in changing placeholder text", e);
+                }
+
+            } catch (e) {
+                console.log("Error occured in form re-ordering", e);
+            }
         });
 
         lock.show();
@@ -395,14 +412,14 @@
 
     </script>
     <script>
-     !function () {
-         var analytics = window.analytics = window.analytics || []; if (!analytics.initialize) if (analytics.invoked) window.console && console.error && console.error("Segment snippet included twice."); else {
-             analytics.invoked = !0; analytics.methods = ["trackSubmit", "trackClick", "trackLink", "trackForm", "pageview", "identify", "reset", "group", "track", "ready", "alias", "debug", "page", "once", "off", "on", "addSourceMiddleware", "addIntegrationMiddleware", "setAnonymousId", "addDestinationMiddleware"]; analytics.factory = function (e) { return function () { var t = Array.prototype.slice.call(arguments); t.unshift(e); analytics.push(t); return analytics } }; for (var e = 0; e < analytics.methods.length; e++) { var key = analytics.methods[e]; analytics[key] = analytics.factory(key) } analytics.load = function (key, e) { var t = document.createElement("script"); t.type = "text/javascript"; t.async = !0; t.src = "https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js"; var n = document.getElementsByTagName("script")[0]; n.parentNode.insertBefore(t, n); analytics._loadOptions = e }; analytics._writeKey = "bkPtWMUMTYDhww2zsJluzxtdhtmSsyd9"; analytics.SNIPPET_VERSION = "4.13.2";
-             analytics.load("bkPtWMUMTYDhww2zsJluzxtdhtmSsyd9");
-             analytics.page();
-         }
-     }();
+        !function () {
+            var analytics = window.analytics = window.analytics || []; if (!analytics.initialize) if (analytics.invoked) window.console && console.error && console.error("Segment snippet included twice."); else {
+                analytics.invoked = !0; analytics.methods = ["trackSubmit", "trackClick", "trackLink", "trackForm", "pageview", "identify", "reset", "group", "track", "ready", "alias", "debug", "page", "once", "off", "on", "addSourceMiddleware", "addIntegrationMiddleware", "setAnonymousId", "addDestinationMiddleware"]; analytics.factory = function (e) { return function () { var t = Array.prototype.slice.call(arguments); t.unshift(e); analytics.push(t); return analytics } }; for (var e = 0; e < analytics.methods.length; e++) { var key = analytics.methods[e]; analytics[key] = analytics.factory(key) } analytics.load = function (key, e) { var t = document.createElement("script"); t.type = "text/javascript"; t.async = !0; t.src = "https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js"; var n = document.getElementsByTagName("script")[0]; n.parentNode.insertBefore(t, n); analytics._loadOptions = e }; analytics._writeKey = "bkPtWMUMTYDhww2zsJluzxtdhtmSsyd9"; analytics.SNIPPET_VERSION = "4.13.2";
+                analytics.load("bkPtWMUMTYDhww2zsJluzxtdhtmSsyd9");
+                analytics.page();
+            }
+        }();
     </script>
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/web-assets/auth0/prod-tenant/universal-login.html b/web-assets/auth0/prod-tenant/universal-login.html
index 3c06779..cd12988 100644
--- a/web-assets/auth0/prod-tenant/universal-login.html
+++ b/web-assets/auth0/prod-tenant/universal-login.html
@@ -110,7 +110,7 @@
                 title: 'Topcoder Login',
                 emailInputPlaceholder: 'Email',
                 passwordInputPlaceholder: 'Password',
-                signUpTerms: 'I agree to the <a href="https://www.topcoder.com/policy/privacy-policy" target="_new"">Privacy Policy</a> of Topcoder.<br/> By clicking "Sign up", you agree to the <a href="https://www.topcoder.com/policy/terms-and-conditions"  target="_new">Terms</a> of Topcoder.',
+                signUpTerms: 'Yes, I understand and agree to the <a href="https://www.topcoder.com/policy/privacy-policy" target="_new"">Privacy Policy</a> and <a href="https://www.topcoder.com/policy/terms-and-conditions"  target="_new">Terms</a> of Topcoder.',
                 signUpTitle: 'Join Topcoder',
                 signUpLabel: 'Sign Up',
                 signUpSubmitLabel: 'Sign Up',
@@ -118,7 +118,7 @@
                 loginLabel: 'Log In',
                 loginSubmitLabel: 'Log In',
                 loginWithLabel: '%s',
-                usernameInputPlaceholder: 'Username / Handle',
+                usernameInputPlaceholder: 'Create a Username / Handle',
                 usernameOrEmailInputPlaceholder: 'Username / Handle',
                 forgotPasswordAction: 'Forgot your password?'
             };
@@ -326,17 +326,10 @@
                     {
                         type: "select",
                         name: "country",
-                        placeholder: "Choose your country",
+                        placeholder: "Select your country (current location)",
                         options: optionsObj,
                         // The following properties are optional
                         prefill: "us"
-                    },
-                    {
-                        name: 'how_did_hear',
-                        placeholder: 'How did you hear about us?',
-                        validator: function () {
-                            return true;
-                        }
                     }
                 ]
             }
@@ -392,6 +385,23 @@
             var mediaQuery = window.matchMedia('(min-width: 1156px)');
             updateSignUp(regSource);
             mediaQuery.addListener(updateSignUp);
+            try {
+                    const firstNameDiv =
+                        document.getElementById("1-firstName").parentNode.parentNode;
+                    const lastNameDiv =
+                        document.getElementById("1-lastName").parentNode.parentNode;
+                    const emailDiv = document.getElementById("1-email").parentNode.parentNode;
+                    emailDiv.parentNode.insertBefore(firstNameDiv, emailDiv);
+                    emailDiv.parentNode.insertBefore(lastNameDiv, emailDiv);
+                    try {
+                        document.getElementsByName("password")[0].placeholder = "Create a Password";
+                        //document.getElementById("1-country").value = "Select your country (current location)";
+                    } catch (e) {
+                        console.log("Error occured in changing placeholder text", e);
+                    }
+                } catch (e) {
+                    console.log("Error occured in form re-ordering", e);
+                }
         });
 
         lock.show();
diff --git a/web-assets/css/styles.css b/web-assets/css/styles.css
index cfd1681..8dbf6d5 100644
--- a/web-assets/css/styles.css
+++ b/web-assets/css/styles.css
@@ -521,7 +521,7 @@ select::-ms-expand {
   font-family: Roboto;
   font-size: 14px;
   line-height: 22px;
-  width: 146px;
+  width: 250px;
   text-align: left;
 }
 
diff --git a/web-assets/static-pages/signup.html b/web-assets/static-pages/signup.html
index 02944bc..184cff8 100644
--- a/web-assets/static-pages/signup.html
+++ b/web-assets/static-pages/signup.html
@@ -63,7 +63,7 @@ <h1 id="page-title-heading" class="page-title-heading">
             <input id="utmMedium" name="utmMedium" value="" type="hidden" />
             <input id="returnUrl" name="returnUrl" value="" type="hidden" />
             <div id="hd" class="input-field active">
-              <label for="handle">Username / Handle</label>
+              <label for="handle">Create a Username / Handle</label>
               <input
                 id="handle"
                 name="handle"
@@ -93,7 +93,7 @@ <h1 id="page-title-heading" class="page-title-heading">
               />
             </div>
             <div id="cc" class="input-field active">
-              <label for="country">Choose your country</label>
+              <label for="country">Select your country (current location)</label>
               <select id="country" name="country" class="input-text">
                 <option value='' ></option>
               </select>
@@ -110,9 +110,8 @@ <h1 id="page-title-heading" class="page-title-heading">
                 <label>
                 <input id='user_privacy_policy' type="checkbox" value="on" class="input-text user_pripacy_policy">
                   <span>
-                    I agree to the <a href="https://www.topcoder.com/policy/privacy-policy" target="_new">Privacy Policy</a> of Topcoder.
-                    <br/>
-                    By clicking "Sign up", you agree to the <a href="https://www.topcoder.com/policy/terms-and-conditions"
+                    Yes, I understand and agree to the <a href="https://www.topcoder.com/policy/privacy-policy" target="_new">Privacy Policy</a> and 
+                    <a href="https://www.topcoder.com/policy/terms-and-conditions"
                       target="_blank" rel="noopener noreferrer">Terms</a> of Topcoder.
                   </span>
                 </label>