diff --git a/templates/battery/form.html.twig b/templates/battery/form.html.twig
index e25270ba..dc7ee01e 100644
--- a/templates/battery/form.html.twig
+++ b/templates/battery/form.html.twig
@@ -53,14 +53,14 @@
 										<div class="form-group m-form__group row">
                                             <div class="col-lg-4">
                                                 <label data-field="prod_code">
-                                                    Product Code:
+                                                    Product Code
                                                 </label>
                                                 <input type="text" name="prod_code" class="form-control m-input" value="{{ obj.getProductCode() }}">
                                                 <div class="form-control-feedback hide" data-field="prod_code"></div>
                                             </div>
                                             <div class="col-lg-4">
                                                 <label data-field="sell_price">
-                                                    Selling Price:
+                                                    Selling Price
                                                 </label>
                                                 <input type="text" name="sell_price" class="form-control m-input" value="{{ obj.getSellingPrice() }}">
                                                 <div class="form-control-feedback hide" data-field="sell_price"></div>
@@ -69,7 +69,7 @@
 										<div class="form-group m-form__group row">
                                             <div class="col-lg-4">
                                                 <label data-field="manufacturer">
-                                                    Manufacturer:
+                                                    Manufacturer
                                                 </label>
                                                 <select class="form-control m-input" id="manufacturer" name="manufacturer">
                                                     <option value=""></option>
@@ -81,7 +81,7 @@
 											</div>
                                             <div class="col-lg-4">
                                                 <label data-field="model">
-                                                    Model:
+                                                    Model
                                                 </label>
 												<select class="form-control m-input" id="model" name="model">
 													<option value=""></option>
@@ -93,7 +93,7 @@
 											</div>
                                             <div class="col-lg-4">
                                                 <label data-field="size">
-                                                    Size:
+                                                    Size
                                                 </label>
 												<select class="form-control m-input" id="size" name="size">
 													<option value=""></option>
@@ -115,7 +115,7 @@
 										<div class="form-group m-form__group row">
                                             <div class="col-lg-4">
                                                 <label data-field="warr_personal">
-                                                    Personal:
+                                                    Personal
                                                 </label>
 												<input type="number" name="warr_personal" class="form-control m-input" value="{{ obj.getWarrantyPersonal() }}">
 												<div class="form-control-feedback hide" data-field="warr_personal"></div>
@@ -123,7 +123,7 @@
 											</div>
                                             <div class="col-lg-4">
                                                 <label data-field="warr_commercial">
-                                                    Commercial:
+                                                    Commercial
                                                 </label>
 												<input type="number" name="warr_commercial" class="form-control m-input" value="{{ obj.getWarrantyCommercial() }}">
                                                     <div class="form-control-feedback hide" data-field="warr_commercial"></div>
@@ -140,7 +140,7 @@
                                             <div class="form-group m-form__group row">
                                                 <div class="col-lg-4">
                                                     <label data-field="length">
-                                                        Length:
+                                                        Length
                                                     </label>
                                                     <input type="number" name="length" class="form-control m-input" value="{{ obj.getLength() }}">
                                                     <div class="form-control-feedback hide" data-field="length"></div>
@@ -148,7 +148,7 @@
                                                 </div>
                                                 <div class="col-lg-4">
                                                     <label data-field="width">
-                                                        Width:
+                                                        Width
                                                     </label>
                                                     <input type="number" name="width" class="form-control m-input" value="{{ obj.getWidth() }}">
                                                     <div class="form-control-feedback hide" data-field="width"></div>
@@ -156,7 +156,7 @@
                                                 </div>
                                                 <div class="col-lg-4">
                                                     <label data-field="height">
-                                                        Height:
+                                                        Height
                                                     </label>
                                                     <input type="number" name="height" class="form-control m-input" value="{{ obj.getHeight() }}">
                                                     <div class="form-control-feedback hide" data-field="height"></div>
@@ -166,7 +166,7 @@
                                             <div class="form-group m-form__group row">
                                                 <div class="col-lg-4">
                                                     <label data-field="total_height">
-                                                        Total Height:
+                                                        Total Height
                                                     </label>
                                                     <input type="number" name="total_height" class="form-control m-input" value="{{ obj.getTotalHeight() }}">
                                                     <div class="form-control-feedback hide" data-field="total_height"></div>
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index e5367bb8..a7a3ff22 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -55,24 +55,24 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
-										<label data-field="customer_first_name">First Name:</label>
+										<label data-field="customer_first_name">First Name</label>
 										<input type="text" name="customer_first_name" id="customer-first-name" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getFirstName }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="customer_first_name"></div>
 									</div>
 									<div class="col-lg-6">
-										<label data-field="customer_last_name">Last Name:</label>
+										<label data-field="customer_last_name">Last Name</label>
 										<input type="text" name="customer_last_name" id="customer-last-name" class="form-control m-input" value="{{ obj.getCustomer ? obj.getCustomer.getLastName }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="customer_last_name"></div>
 									</div>
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
-										<label data-field="customer_mobile_numbers">Mobile Numbers:</label>
+										<label data-field="customer_mobile_numbers">Mobile Numbers</label>
 										<textarea name="customer_mobile_numbers" id="customer-mobile-numbers" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" rows="4" disabled>{{ obj.getCustomer ? obj.getCustomer.getMobileNumberList|join("\r\n") }}</textarea>
 										<div class="form-control-feedback hide" data-field="customer_mobile_numbers"></div>
 									</div>
 									<div class="col-lg-6">
-										<label data-field="customer_customer_notes">Customer Notes:</label>
+										<label data-field="customer_customer_notes">Customer Notes</label>
 										<textarea name="customer_customer_notes" id="customer-customer-notes" class="form-control m-input" placeholder="Select a vehicle first" data-vehicle-field="1" rows="4" disabled>{{ obj.getCustomer ? obj.getCustomer.getCustomerNotes }}</textarea>
 										<div class="form-control-feedback hide" data-field="customer_customer_notes"></div>
 									</div>
@@ -86,22 +86,22 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
-										<label data-field="vmfg">Vehicle Manufacturer:</label>
+										<label data-field="vmfg">Vehicle Manufacturer</label>
 										<input type="text" name="vmfg" id="vmfg" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getManufacturer.getName }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vmfg"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="vehicle_make">Vehicle Make:</label>
+										<label data-field="vehicle_make">Vehicle Make</label>
 										<input type="text" name="vehicle_make" id="vehicle-make" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getMake }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_make"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="vehicle_year">Vehicle Model Year:</label>
+										<label data-field="vehicle_year">Vehicle Model Year</label>
 										<input type="text" name="vehicle_year" id="vehicle-year" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getModelYear }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_year"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="vehicle_color">Vehicle Color:</label>
+										<label data-field="vehicle_color">Vehicle Color</label>
 										<input type="text" name="vehicle_color" id="vehicle-color" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getColor }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="vehicle_color"></div>
 									</div>
@@ -115,17 +115,17 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
-										<label data-field="current_battery">Current Battery:</label>
+										<label data-field="current_battery">Current Battery</label>
 										<input type="text" name="current_battery" id="current-battery" class="form-control m-input" value="{{ obj.getCustomerVehicle and obj.getCustomerVehicle.getCurrentBattery ? obj.getCustomerVehicle.getCurrentBattery.getManufacturer.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getModel.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getSize.getName ~ ' (' ~ obj.getCustomerVehicle.getCurrentBattery.getProductCode ~ ')' }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="current_battery"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="warranty_code">Warranty Code:</label>
+										<label data-field="warranty_code">Warranty Code</label>
 										<input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="warranty_code"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="warranty_expiration">Warranty Expiration Date:</label>
+										<label data-field="warranty_expiration">Warranty Expiration Date</label>
 										<input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") }}" placeholder="Select a vehicle first" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="warranty_expiration"></div>
 									</div>
@@ -147,7 +147,7 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
-										<label data-field="service_type">Service Type:</label>
+										<label data-field="service_type">Service Type</label>
 										<select class="form-control m-input" name="service_type">
 											<!--<option value=""></option>-->
 											{% for key, service in service_types %}
@@ -159,12 +159,12 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
-										<label>Transaction Date:</label>
+										<label>Transaction Date</label>
 										<input type="text" name="date_transaction" class="form-control m-input" value="{{ obj.getDateCreate|default("now")|date('d M Y') }}" disabled>
 										<div class="form-control-feedback hide" data-field="date_transaction"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="date_schedule">Scheduled Date:</label>
+										<label data-field="date_schedule">Scheduled Date</label>
 										<div class="input-group date dp">
 											<input type="text" name="date_schedule_date" class="form-control m-input" data-default-value="{{ obj.getDateSchedule|default("now")|date('Y-m-d') }}" value="{{ obj.getDateSchedule|default("now")|date('d M Y') }}" readonly placeholder="Select a date" disabled>
 											<span class="input-group-addon">
@@ -174,7 +174,7 @@
 										<div class="form-control-feedback hide" data-field="date_schedule_date"></div>
 									</div>
 									<div class="col-lg-3">
-										<label data-field="date_schedule">Scheduled Time:</label>
+										<label data-field="date_schedule">Scheduled Time</label>
 										<div class="input-group">
 											<input type="text" name="date_schedule_time" class="form-control m-input tp" data-default-value="{{ obj.getDateSchedule|default("now")|date('g:i A') }}" value="{{ obj.getDateSchedule|default("now")|date('g:i A') }}" readonly placeholder="Select a time" disabled>
 											<span class="input-group-addon">
@@ -186,19 +186,19 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
-										<label data-field="delivery_instructions">Delivery Instructions:</label>
+										<label data-field="delivery_instructions">Delivery Instructions</label>
 										<textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
 										<div class="form-control-feedback hide" data-field="delivery_instructions"></div>
 									</div>
 									<div class="col-lg-6">
-										<label data-field="agent_notes">Agent Notes:</label>
+										<label data-field="agent_notes">Agent Notes</label>
 										<textarea name="agent_notes" class="form-control m-input" rows="4">{{ obj.getAgentNotes }}</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-6">
-										<label data-field="status">Status:</label>
+										<label data-field="status">Status</label>
 										<select class="form-control m-input" name="status">
 											<!--<option value=""></option>-->
 											{% for key, status in statuses %}
@@ -218,14 +218,14 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
-										<label data-field="delivery_address">Delivery Address:</label>
+										<label data-field="delivery_address">Delivery Address</label>
 										<textarea name="delivery_address" class="form-control m-input" rows="4">{{ obj.getDeliveryAddress }}</textarea>
 										<div class="form-control-feedback hide" data-field="delivery_address"></div>
 									</div>
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-12">
-										<label name="coordinates" data-field="coordinates">Coordinates:</label>
+										<label name="coordinates" data-field="coordinates">Coordinates</label>
 										<input type="hidden" id="map_lat" name="coord_lat" value="">
 		                                <input type="hidden" id="map_lng" name="coord_lng" value="">
 		                                <div class="input-group">
@@ -250,19 +250,19 @@
 								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-3">
-										<label>Amount:</label>
+										<label>Amount</label>
 										<input type="text" id="invoice-amount" class="form-control m-input text-right" value="0.00" disabled>
 									</div>
 									<div class="col-lg-3">
-										<label>Tax:</label>
+										<label>Tax</label>
 										<input type="text" id="invoice-tax" class="form-control m-input text-right" value="0.00" disabled>
 									</div>
 									<div class="col-lg-3">
-										<label>Discount:</label>
+										<label>Discount</label>
 										<input type="text" id="invoice-discount" class="form-control m-input text-right" value="0.00" disabled>
 									</div>
 									<div class="col-lg-3">
-										<label>Final Amount:</label>
+										<label>Final Amount</label>
 										<input type="text" id="invoice-final-amount" class="form-control m-input text-right" value="0.00" disabled>
 									</div>
 								</div>
diff --git a/templates/outlet/form.html.twig b/templates/outlet/form.html.twig
index bc0af825..dbfff2d8 100644
--- a/templates/outlet/form.html.twig
+++ b/templates/outlet/form.html.twig
@@ -46,7 +46,7 @@
                         </div>
                         <div class="form-group m-form__group row no-border">
                             <div class="col-lg-6">
-                                <label data-field="hub">Hub:</label>
+                                <label data-field="hub">Hub</label>
                                 <select class="form-control m-input" id="hub" name="hub">
                                     <option value=""></option>
                                     {% for hub in hubs %}