diff --git a/templates/job-order/incoming.html.twig b/templates/job-order/incoming.html.twig
index 3fc853c6..0df32e36 100644
--- a/templates/job-order/incoming.html.twig
+++ b/templates/job-order/incoming.html.twig
@@ -97,7 +97,7 @@
 									</span>
 								</div>
 								<div class="form-group m-form__group row">
-									<div class="col-lg-3">
+									<div class="col-lg-6">
 										<label>Service Type:</label>
 										<select class="form-control m-input" name="service_type">
 											<!--<option value=""></option>-->
@@ -107,7 +107,9 @@
 										</select>
 										<div class="form-control-feedback hide" data-field="service_type"></div>
 									</div>
-									<div class="col-lg-3">
+								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-6">
 										<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>
@@ -146,7 +148,7 @@
 									</div>
 								</div>
 								<div class="form-group m-form__group row">
-									<div class="col-lg-3">
+									<div class="col-lg-6">
 										<label>Status:</label>
 										<select class="form-control m-input" name="status">
 											<!--<option value=""></option>-->
@@ -380,6 +382,7 @@ $(function() {
 			resetVehicleFields();
 			
 			// set form fields
+			$("[data-vehicle-field='1']").prop('placeholder', '');
 			$("#vmfg").val(vdata.vehicle.mfg_name);
 			$("#vehicle-model").val(vdata.vehicle.make);
 			$("#vehicle-year").val(vdata.vehicle.model_year);
@@ -387,8 +390,8 @@ $(function() {
 
 			if (typeof vdata.battery !== 'undefined') {
 				$("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")");
-				$("#warranty-code").val(vdata.battery.warranty_code);
-				$("#warranty-expiration").val(vdata.battery.warranty_expiration);
+				$("#warranty-code").val(vdata.battery.warranty_code).prop('placeholder', '');
+				$("#warranty-expiration").val(vdata.battery.warranty_expiration).prop('placeholder', '');
 			} else {
 				$("#current-battery, #warranty-code, #warranty-expiration").val("No current battery").css('color', '#f4516c');
 			}
@@ -397,7 +400,7 @@ $(function() {
 
     // reset all vehicle info form fields
     function resetVehicleFields() {
-    	$("[data-vehicle-field='1']").val("").css('color', '');
+    	$("[data-vehicle-field='1']").val("").css('color', '').prop('placeholder', 'Select a vehicle first');
     }
 
 	// datepicker