diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
index 9dc7e98c..641b188c 100644
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -25,7 +25,6 @@ class Customer
     // title
     /**
      * @ORM\Column(type="string", length=80)
-     * @Assert\NotBlank()
      */
     protected $title;
 
diff --git a/src/Ramcar/JOStatus.php b/src/Ramcar/JOStatus.php
index 3a08679f..d31447db 100644
--- a/src/Ramcar/JOStatus.php
+++ b/src/Ramcar/JOStatus.php
@@ -7,16 +7,18 @@ class JOStatus extends NameValue
     const PENDING       = 'pending';
     const RIDER_ASSIGN  = 'rider_assign';
     const ASSIGNED      = 'assigned';
+    const IN_TRANSIT    = 'in_transit';
     const IN_PROGRESS   = 'in_progress';
     const CANCELLED     = 'cancelled';
     const FULFILLED     = 'fulfilled';
 
     const COLLECTION = [
-        'pending' => 'Pending',
+        'pending' => 'For Dispatch',
         'rider_assign' => 'For Rider Assignment',
         'assigned' => 'Assigned',
+        'in_transit' => 'In Transit',
         'in_progress' => 'In Progress',
         'cancelled' => 'Cancelled',
-        'fulfilled' => 'Fulfilled',
+        'fulfilled' => 'Completed',
     ];
 }
diff --git a/src/Ramcar/ModeOfPayment.php b/src/Ramcar/ModeOfPayment.php
index 77f0098f..7e067630 100644
--- a/src/Ramcar/ModeOfPayment.php
+++ b/src/Ramcar/ModeOfPayment.php
@@ -13,6 +13,6 @@ class ModeOfPayment extends NameValue
         'cash' => 'Cash',
         'credit_card' => 'Credit Card',
         'debit_card' => 'Debit Card',
-        'installment' => 'Installment',
+        'installment' => 'Installment - BDO',
     ];
 }
diff --git a/src/Ramcar/ServiceType.php b/src/Ramcar/ServiceType.php
index 28c68d98..abdc19e4 100644
--- a/src/Ramcar/ServiceType.php
+++ b/src/Ramcar/ServiceType.php
@@ -14,13 +14,13 @@ class ServiceType extends NameValue
     const EMERGENCY_REFUEL              = 'fuel';
 
     const COLLECTION = [
-        'battery_new' => 'Battery Replacement (New)',
-        'battery_warranty' => 'Battery Replacement (Under Warranty)',
+        'battery_new' => 'Battery Sales',
+        'battery_warranty' => 'Under Warranty',
         'jumpstart_troubleshoot' => 'General Service',
         'post_recharged' => 'Post - Recharged',
         'post_replacement' => 'Post - Replacement',
-        'tire' => 'Tire Repair',
+        'tire' => 'Flat Tire',
         'overheat' => 'Overheat Assistance',
-        'fuel' => 'Emergency Refuel',
+        'fuel' => 'Fuel',
     ];
 }
diff --git a/src/Ramcar/TradeInType.php b/src/Ramcar/TradeInType.php
index eeb559fa..fa830be0 100644
--- a/src/Ramcar/TradeInType.php
+++ b/src/Ramcar/TradeInType.php
@@ -4,11 +4,13 @@ namespace App\Ramcar;
 
 class TradeInType extends NameValue
 {
-    const MOTOLITE	= 'motolite';
-    const OTHER   	= 'other';
+    const PREMIUM       = 'premium';
+    const MOTOLITE	    = 'motolite';
+    const OTHER   	    = 'other';
 
     const COLLECTION = [
-        'motolite' => 'Motolite',
+        'premium' => 'Premium',
+        'motolite' => 'Non-premium',
         'other' => 'Other',
     ];
 }
diff --git a/src/Ramcar/TransactionOrigin.php b/src/Ramcar/TransactionOrigin.php
index a7f64b73..baf412f1 100644
--- a/src/Ramcar/TransactionOrigin.php
+++ b/src/Ramcar/TransactionOrigin.php
@@ -7,12 +7,14 @@ class TransactionOrigin extends NameValue
     const CALL              = 'call';
     const ONLINE            = 'online';
     const FACEBOOK          = 'facebook';
+    const VIP               = 'vip';
     const MOBILE_APP        = 'mobile_app';
 
     const COLLECTION = [
-        'call' => 'Call',
+        'call' => 'Hotline',
         'online' => 'Online',
         'facebook' => 'Facebook',
+        'vip' => 'VIP',
         'mobile_app' => 'Mobile App',
     ];
 }
diff --git a/src/Service/InvoiceCreator.php b/src/Service/InvoiceCreator.php
index 89504d31..aea1d63f 100644
--- a/src/Service/InvoiceCreator.php
+++ b/src/Service/InvoiceCreator.php
@@ -37,6 +37,7 @@ class InvoiceCreator
 
     public function getTradeInRate($trade_in)
     {
+        // TODO: modify this with the prices based on size
         if ($trade_in == 'motolite')
             return self::TIRATE_MOTOLITE;
 
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index 5278a332..f1fa1853 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -371,7 +371,7 @@
 									<div class="form-control-feedback hide" data-field="battery"></div>
 								</div>
 								<div class="col-lg-3">
-									<label for="battery-warranty-code" data-field="warranty_code">Warranty Code</label>
+									<label for="battery-warranty-code" data-field="warranty_code">Serial Number</label>
 									<input type="text" name="warranty_code" id="battery-warranty-code" class="form-control m-input" data-required="0">
 									<div class="form-control-feedback hide" data-field="warranty_code"></div>
 								</div>
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 238f887a..afbfac8f 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -195,7 +195,7 @@
 										<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">Serial Number</label>
 										<input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="warranty_code"></div>
 									</div>
@@ -282,12 +282,12 @@
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
 										<label data-field="tier1_notes">Tier 1 Notes</label>
-										<textarea name="tier1_notes" class="form-control m-input" rows="4">{{ obj.getTier1Notes }}</textarea>
+										<textarea name="tier1_notes" class="form-control m-input" rows="15">{{ obj.getTier1Notes }}</textarea>
 										<div class="form-control-feedback hide" data-field="tier1_notes"></div>
 									</div>
 									<div class="col-lg-6">
 										<label data-field="tier2_notes">Tier 2 Notes</label>
-										<textarea name="tier2_notes" class="form-control m-input" rows="4">{{ obj.getTier2Notes }}</textarea>
+										<textarea name="tier2_notes" class="form-control m-input" rows="15">{{ obj.getTier2Notes }}</textarea>
 										<div class="form-control-feedback hide" data-field="tier2_notes"></div>
 									</div>
 								</div>
@@ -528,8 +528,10 @@
 														<tr>
 															<th>Hub</th>
 															<th>Branch</th>
+                                                            <!--
 															<th class="text-right">Distance</th>
 															<th class="text-right">Travel Time</th>
+                                                            -->
 															<th class="text-right">Available Riders</th>
 															<th class="text-right">Jobs For Assignment</th>
 															<th>Contact Numbers</th>														</tr>
@@ -545,11 +547,13 @@
 															<tr data-lat="{{ hub.hub.getCoordinates.getLatitude }}" data-lng="{{ hub.hub.getCoordinates.getLongitude }}" data-id="{{ hub.hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.hub.getID ? ' class="m-table__row--primary"' }}>
 																<td>{{ hub.hub.getName }}</td>
 																<td>{{ hub.hub.getBranch }}</td>
+                                                                <!--
 																<td class="text-right">{{ hub.distance ? hub.distance : '-' }}</td>
 																<td class="text-right">{{ hub.duration ? hub.duration : '-' }}</td>
+                                                                -->
 																<td class="text-right">{{ hub.rider_count }}</td>
 																<td class="text-right">{{ hub.jo_count }}</td>
-																<td>{{ hub.hub.getContactNumbers }}</td>
+																<td>{{ hub.hub.getContactNumbers|replace({"\n": ', '}) }}</td>
 															</tr>
 														{% endfor %}
 													</tbody>
diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig
index a9887bcc..0c446c6c 100644
--- a/templates/job-order/list.all.html.twig
+++ b/templates/job-order/list.all.html.twig
@@ -97,10 +97,6 @@
 						field: 'processor',
 						title: 'Dispatcher'
 					},
-                    {
-                        field: 'assignor',
-                        title: 'Assignor'
-                    },
 					{
 						field: 'Actions',
 						width: 110,
diff --git a/templates/job-order/list.assigning.html.twig b/templates/job-order/list.assigning.html.twig
index 18fa348e..2b68ba7e 100644
--- a/templates/job-order/list.assigning.html.twig
+++ b/templates/job-order/list.assigning.html.twig
@@ -97,10 +97,6 @@
 						field: 'processor',
 						title: 'Dispatcher'
 					},
-                    {
-                        field: 'assignor',
-                        title: 'Assignor'
-                    },
 					{
 						field: 'Actions',
 						width: 110,
diff --git a/templates/job-order/list.fulfillment.html.twig b/templates/job-order/list.fulfillment.html.twig
index 3fc20a2b..b425e792 100644
--- a/templates/job-order/list.fulfillment.html.twig
+++ b/templates/job-order/list.fulfillment.html.twig
@@ -97,10 +97,6 @@
 						field: 'processor',
 						title: 'Dispatcher'
 					},
-                    {
-                        field: 'assignor',
-                        title: 'Assignor'
-                    },
 					{
 						field: 'Actions',
 						width: 110,
diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig
index 7e1ed22c..0f7ddb97 100644
--- a/templates/job-order/list.open.html.twig
+++ b/templates/job-order/list.open.html.twig
@@ -97,10 +97,6 @@
 						field: 'processor',
 						title: 'Dispatcher'
 					},
-                    {
-                        field: 'assignor',
-                        title: 'Assignor'
-                    },
 					{
 						field: 'Actions',
 						width: 110,