diff --git a/frontend/index.html b/frontend/index.html
index 1035744..e2290d1 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -141,6 +141,47 @@
         </div>
       </div>
 
+      <!-- Company & Contact -->
+      <div class="bg-gray-50 rounded-xl p-4 sm:p-6">
+        <div class="text-lg font-semibold text-gray-700 mb-4 pb-2 border-b-2 border-primary">Company & Contact Information</div>
+        
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
+          <div class="flex flex-col">
+            <label for="Company_Client" class="block text-sm font-medium text-gray-700 mb-2">Company / Client</label>
+            <input type="text" id="Company_Client" name="Company_Client" placeholder="Enter company or client name" autocomplete="organization"
+              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
+          </div>
+          
+          <div class="flex flex-col">
+            <label for="Contact_Person" class="block text-sm font-medium text-gray-700 mb-2">Contact Person</label>
+            <input type="text" id="Contact_Person" name="Contact_Person" placeholder="Enter contact person" autocomplete="name"
+              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
+          <div class="flex flex-col">
+            <label for="Phone_Number" class="block text-sm font-medium text-gray-700 mb-2">Phone Number</label>
+            <input type="tel" id="Phone_Number" name="Phone_Number" placeholder="Enter phone number" autocomplete="tel"
+              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
+          </div>
+          
+          <div class="flex flex-col">
+            <label for="Email" class="block text-sm font-medium text-gray-700 mb-2">Email</label>
+            <input type="email" id="Email" name="Email" placeholder="Enter email address" autocomplete="email"
+              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-6">
+          <div class="flex flex-col">
+            <label for="Job_Address" class="block text-sm font-medium text-gray-700 mb-2">Job Address</label>
+            <input type="text" id="Job_Address" name="Job_Address" placeholder="Enter job address" autocomplete="street-address"
+              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
+          </div>
+        </div>
+      </div>
+
       <!-- Personnel -->
       <div class="bg-gray-50 rounded-xl p-4 sm:p-6">
         <div class="text-lg font-semibold text-gray-700 mb-4 pb-2 border-b-2 border-primary">Personnel & Estimator</div>
@@ -189,7 +230,16 @@
       <!-- Schedule & Dates -->
       <div class="bg-gray-50 rounded-xl p-4 sm:p-6">
         <div class="text-lg font-semibold text-gray-700 mb-4 pb-2 border-b-2 border-primary">Schedule & Dates</div>
-        
+
+        <!-- Start Date (moved to top) -->
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
+          <div class="flex flex-col">
+            <label for="Start_Date" class="block text-sm font-medium text-gray-700 mb-2">Start Date</label>
+            <input type="text" id="Start_Date" name="Start_Date" class="datepicker w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all" placeholder="Select start date" autocomplete="off">
+          </div>
+        </div>
+
+        <!-- Schedule Confidence (now second) -->
         <div class="grid grid-cols-1 gap-6 mb-6">
           <div class="flex flex-col">
             <label for="Schedule_Confidence" class="block text-sm font-medium text-gray-700 mb-2">Schedule Confidence</label>
@@ -210,7 +260,22 @@
           </div>
         </div>
 
-        <div class="grid grid-cols-1 gap-6 mb-6">
+        <!-- Due Date and Time (now third) -->
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
+          <div class="flex flex-col">
+            <label for="Due_Date" class="block text-sm font-medium text-gray-700 mb-2">Due Date</label>
+            <input type="text" id="Due_Date" name="Due_Date" class="datepicker w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all" placeholder="Select due date" autocomplete="off">
+          </div>
+
+          <div class="flex flex-col">
+            <label for="Due_Time" class="block text-sm font-medium text-gray-700 mb-2">Due Time</label>
+            <input type="text" id="Due_Time" name="Due_Time" placeholder="Enter time" autocomplete="off"
+              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
+          </div>
+        </div>
+
+        <!-- Due Date Source (now last) -->
+        <div class="grid grid-cols-1 gap-6">
           <div class="flex flex-col">
             <label class="block text-sm font-medium text-gray-700 mb-2">Due Date Source</label>
             <div class="flex flex-wrap gap-4">
@@ -229,68 +294,9 @@
             </div>
           </div>
         </div>
-
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
-          <div class="flex flex-col">
-            <label for="Due_Date" class="block text-sm font-medium text-gray-700 mb-2">Due Date</label>
-            <input type="text" id="Due_Date" name="Due_Date" class="datepicker w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all" placeholder="Select due date" autocomplete="off">
-          </div>
-          
-          <div class="flex flex-col">
-            <label for="Due_Time" class="block text-sm font-medium text-gray-700 mb-2">Due Time</label>
-            <input type="text" id="Due_Time" name="Due_Time" placeholder="Enter time" autocomplete="off"
-              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
-          </div>
-        </div>
-
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-          <div class="flex flex-col">
-            <label for="Start_Date" class="block text-sm font-medium text-gray-700 mb-2">Start Date</label>
-            <input type="text" id="Start_Date" name="Start_Date" class="datepicker w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all" placeholder="Select start date" autocomplete="off">
-          </div>
-        </div>
       </div>
 
-      <!-- Company & Contact -->
-      <div class="bg-gray-50 rounded-xl p-4 sm:p-6">
-        <div class="text-lg font-semibold text-gray-700 mb-4 pb-2 border-b-2 border-primary">Company & Contact Information</div>
-        
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
-          <div class="flex flex-col">
-            <label for="Company_Client" class="block text-sm font-medium text-gray-700 mb-2">Company / Client</label>
-            <input type="text" id="Company_Client" name="Company_Client" placeholder="Enter company or client name" autocomplete="organization"
-              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
-          </div>
-          
-          <div class="flex flex-col">
-            <label for="Contact_Person" class="block text-sm font-medium text-gray-700 mb-2">Contact Person</label>
-            <input type="text" id="Contact_Person" name="Contact_Person" placeholder="Enter contact person" autocomplete="name"
-              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
-          </div>
-        </div>
-
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-6">
-          <div class="flex flex-col">
-            <label for="Phone_Number" class="block text-sm font-medium text-gray-700 mb-2">Phone Number</label>
-            <input type="tel" id="Phone_Number" name="Phone_Number" placeholder="Enter phone number" autocomplete="tel"
-              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
-          </div>
-          
-          <div class="flex flex-col">
-            <label for="Email" class="block text-sm font-medium text-gray-700 mb-2">Email</label>
-            <input type="email" id="Email" name="Email" placeholder="Enter email address" autocomplete="email"
-              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
-          </div>
-        </div>
-
-        <div class="grid grid-cols-1 gap-6">
-          <div class="flex flex-col">
-            <label for="Job_Address" class="block text-sm font-medium text-gray-700 mb-2">Job Address</label>
-            <input type="text" id="Job_Address" name="Job_Address" placeholder="Enter job address" autocomplete="street-address"
-              class="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent transition-all">
-          </div>
-        </div>
-      </div>
+      
 
       <!-- Financial -->
       <div id="financialSection" class="bg-red-100 border border-red-200 rounded-xl p-4 sm:p-6 transition-colors">
@@ -551,7 +557,7 @@
 
   <!-- Version Info -->
   <div class="fixed bottom-4 right-4 text-xs text-gray-400">
-    v1.0.0-beta1
+    v1.0.0-beta2
   </div>
 </body>
 </html>
diff --git a/package.json b/package.json
index e791944..d24eb52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "job-creation-with-excel-sync",
-  "version": "1.0.0",
+  "version": "1.0.0-beta2",
   "description": "Unified job creation form with PocketBase and Excel sync",
   "type": "module",
   "scripts": {