diff --git a/templates/job-order/incoming.html.twig b/templates/job-order/incoming.html.twig
index 1ac54cc5..3fc853c6 100644
--- a/templates/job-order/incoming.html.twig
+++ b/templates/job-order/incoming.html.twig
@@ -36,11 +36,13 @@
 									</h3>
 								</div>
 								<div class="form-group m-form__group row">
-									<div class="col-lg-3">
+									<div class="col-lg-6">
 										<label>Select a vehicle:</label>
 										<select class="form-control m-select2" id="customer-vehicle" name="customer_vehicle"></select>
 										<div class="form-control-feedback hide" data-field="customer_vehicle"></div>
 									</div>
+								</div>
+								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
 										<label>Vehicle Manufacturer:</label>
 										<input type="text" name="vmfg" id="vmfg" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
@@ -56,13 +58,13 @@
 										<input type="text" name="vehicle_year" id="vehicle-year" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_year"></div>
 									</div>
-								</div>
-								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
 										<label>Vehicle Color:</label>
 										<input type="text" name="vehicle_color" id="vehicle-color" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_color"></div>
 									</div>
+								</div>
+								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
 										<label>Current Battery:</label>
 										<input type="text" name="current_battery" id="current-battery" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
@@ -95,11 +97,6 @@
 									</span>
 								</div>
 								<div class="form-group m-form__group row">
-									<div class="col-lg-3">
-										<label>Transaction Date:</label>
-										<input type="text" name="date_transaction" class="form-control m-input" value="{{ "now"|date('d M Y') }}" readonly>
-										<div class="form-control-feedback hide" data-field="date_transaction"></div>
-									</div>
 									<div class="col-lg-3">
 										<label>Service Type:</label>
 										<select class="form-control m-input" name="service_type">
@@ -110,6 +107,11 @@
 										</select>
 										<div class="form-control-feedback hide" data-field="service_type"></div>
 									</div>
+									<div class="col-lg-3">
+										<label>Transaction Date:</label>
+										<input type="text" name="date_transaction" class="form-control m-input" value="{{ "now"|date('d M Y') }}" disabled>
+										<div class="form-control-feedback hide" data-field="date_transaction"></div>
+									</div>
 									<div class="col-lg-3">
 										<label>Scheduled Date:</label>
 										<div class="input-group date dp">
@@ -131,6 +133,18 @@
 										<div class="form-control-feedback hide" data-field="date_schedule_time"></div>
 									</div>
 								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-6">
+										<label>Delivery Instructions:</label>
+										<textarea name="delivery_instructions" class="form-control m-input" rows="4"></textarea>
+										<div class="form-control-feedback hide" data-field="delivery_instructions"></div>
+									</div>
+									<div class="col-lg-6">
+										<label>Agent Notes:</label>
+										<textarea name="agent_notes" class="form-control m-input" rows="4"></textarea>
+										<div class="form-control-feedback hide" data-field="agent_notes"></div>
+									</div>
+								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
 										<label>Status:</label>
@@ -142,16 +156,6 @@
 										</select>
 										<div class="form-control-feedback hide" data-field="status"></div>
 									</div>
-									<div class="col-lg-3">
-										<label>Delivery Instructions:</label>
-										<textarea name="delivery_instructions" class="form-control m-input" rows="4"></textarea>
-										<div class="form-control-feedback hide" data-field="delivery_instructions"></div>
-									</div>
-									<div class="col-lg-3">
-										<label>Agent Notes:</label>
-										<textarea name="agent_notes" class="form-control m-input" rows="4"></textarea>
-										<div class="form-control-feedback hide" data-field="agent_notes"></div>
-									</div>
 								</div>
 							</div>
 							<div class="m-form__seperator m-form__seperator--dashed"></div>