diff --git a/app/scripts/controllers/register.js b/app/scripts/controllers/register.js
index 99bf7ae..8eb94ae 100644
--- a/app/scripts/controllers/register.js
+++ b/app/scripts/controllers/register.js
@@ -728,6 +728,7 @@ async function createPaymentMethod(paymentDetails) {
 	}
 	    $scope.useTemplate = function (template) {
       $scope.selectedTemplate = template;
+      $scope.finishSignup();
     };
     $scope.isSelected = function (template) {
       if ($scope.selectedTemplate && template.id === $scope.selectedTemplate.id) {
diff --git a/app/styles/custom.css b/app/styles/custom.css
index 5ba15bb..00519f5 100644
--- a/app/styles/custom.css
+++ b/app/styles/custom.css
@@ -813,6 +813,13 @@ table {
 
 /*# sourceMappingURL=custom.css.map */
 
+/* Workspace name step - full-width input with domain suffix */
+.login-page .content .login-form .inputs md-input-container {
+  width: 100%;
+  padding: 0;
+  margin: 0;
+}
+
 /*
 * custom sidebar styles for dashboard for mobile responsiveness
 */
@@ -1502,13 +1509,14 @@ md-content{
   line-height: 1.5;
 }
 .accept-payment{
-  margin-right: 0px;
+  margin-right: 10px !important;
   margin-bottom: 50px;
 }
 .accept-payment-terms{
   font-size: 10px;
   font-weight: 400;
   line-height: 1.8;
+  margin-top: 4px;
 }
 .payment-detail{
   font-size: 20px;
diff --git a/app/views/pages/register.html b/app/views/pages/register.html
index 6533dc1..95e8d42 100644
--- a/app/views/pages/register.html
+++ b/app/views/pages/register.html
@@ -345,9 +345,9 @@ <h3>Enter Workspace Name</h3>
                                 </div>
                             </div>
                             <div class="inputs">
-                                <div class="clearfix" style="width: 500px;">
-                                    <div style="float:left; width: 364px;">
-                                        <md-input-container>
+                                <div style="display: flex; align-items: flex-start; width: 100%;">
+                                    <div style="flex: 1; min-width: 0; margin-right: 5px;">
+                                        <md-input-container style="width: 100%; margin: 0;">
                                             <input name="workspace" ng-model="workspace" type="text"
                                                 placeholder="e.g: abc-workspace" required="">
                                             <div ng-show="triedSubmit">
@@ -363,8 +363,8 @@ <h3>Enter Workspace Name</h3>
                                             </div>
                                         </md-input-container>
                                     </div>
-                                    <div style="float: left; width: 136px;">
-                                        <h5>.{{$shared.getAppPortalDomain(null, true)}}</h5>
+                                    <div style="white-space: nowrap; padding-top: 8px;">
+                                        <h5 style="margin: 0;">.{{$shared.getAppPortalDomain(null, true)}}</h5>
                                     </div>
                                 </div>
 
@@ -610,13 +610,6 @@ <h3 flex="100">Setup Your Call System</h3>
                                 </md-card>
                             </div>
                         </div>
-                        <br />
-                        <br />
-                        <div class="login-btn">
-                            <button>
-                                <span class="login-custom">Next</span>
-                            </button>
-                        </div>
                     </form>
                 </div>