diff --git a/signin.php b/signin.php
index 4852159..753ad9d 100644
--- a/signin.php
+++ b/signin.php
@@ -195,21 +195,14 @@ if(empty($form_data['form_data_stage'])){
           <?php echo $transLang['STR_VENDORINFO_CUSTOMERORVENDOR_DESC']; ?>
         </div>
       </div>
-      <div class="row row-cols-1 mb-4">
-        <div class="col d-grid gap-2">
-          <div class="btn-group">
-            <input type="radio" class="btn-check btn-lg" name="form_data_isvendor" id="customer-outlined" autocomplete="off" value="0" required>
-            <label class="btn btn-outline-primary btn-lg" for="customer-outlined"><?php echo $transLang['CUSTOMER']; ?></label>
-            <input type="radio" class="btn-check btn-lg" name="form_data_isvendor" id="vendor-outlined" autocomplete="off" value="1" required>
-            <label class="btn btn-outline-primary btn-lg" for="vendor-outlined"><?php echo $transLang['STR_VENDORINFO_VENDOR_TITLE']; ?></label>
-          </div>
-        </div>
-      </div>
-      <div class="row row-cols-1 mb-4">
+      <div class="row row-cols-2 mb-4">
         <div class="col d-grid gap-2">
           <input type="hidden" name="form_data_stage" id="form_data_stage" value="nameandcompany" />
           <input type="hidden" name="form_data_siteid" id="form_data_siteid" value="<?php echo $form_data['form_data_siteid']; ?>" />
-          <button type="submit" id="saveBtn" class="btn btn-lg btn-success" name="saveBtn"><?php echo $transLang['NEXT']; ?></button>
+          <button type="submit" id="form_data_isvendor" class="btn btn-lg btn-outline-primary" name="form_data_isvendor" value="0">&nbsp;<br><?php echo $transLang['CUSTOMER']; ?><br>&nbsp;</button>
+        </div>
+        <div class="col d-grid gap-2">
+          <button type="submit" id="form_data_isvendor" class="btn btn-lg btn-outline-primary" name="form_data_isvendor" value="1">&nbsp;<br><?php echo $transLang['STR_VENDORINFO_VENDOR_TITLE']; ?><br>&nbsp;</button>
         </div>
       </div>
     </form>
@@ -280,11 +273,6 @@ if(empty($form_data['form_data_stage'])){
           <div class="input-group mb-3">
             <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"><?php echo $transLang['STR_VENDORINFO_WORKSTART_TITLE']; ?>&nbsp;<i class="fas fa-clock"></i></span>
             <input placeholder="" name="form_data_workstart" type="text" class="form-control form-control-sm bg-white datetimepicker-input datetimepicker-form_data_workstart" id="datetimepicker-form_data_workstart" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"/>
-            <script type="text/javascript">
-              $(function () {
-                $('.datetimepicker-form_data_workstart').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
-              });
-            </script>
           </div>
         </div>
         <div class="col d-grid gap-2">
@@ -293,6 +281,7 @@ if(empty($form_data['form_data_stage'])){
             <input placeholder="" name="form_data_workend" type="text" class="form-control form-control-sm bg-white datetimepicker-input datetimepicker-form_data_workend" id="datetimepicker-form_data_workend" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"/>
             <script type="text/javascript">
               $(function () {
+                $('.datetimepicker-form_data_workstart').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
                 $('.datetimepicker-form_data_workend').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
               });
             </script>