diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 23d08d6b..899ba83e 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -479,7 +479,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
                 $new_cv->setCustomer($new_cust)
                     ->setVehicle($new_vehicle)
-                    ->setPlateNumber($req->request->get('cv_plate'))
+                    ->setPlateNumber(trim($req->request->get('cv_plate')))
                     ->setModelYear($req->request->get('cv_year'))
                     ->setColor('')
                     ->setStatusCondition('')
@@ -2490,7 +2490,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
 
             // check if plate number is in request
-            if (empty($req->request->get('cv_plate')))
+            if (empty(trim($req->request->get('cv_plate'))))
                 $error_array['cv_plate'] = 'Plate number is required.';
 
             // find the vehicle using vid
@@ -2516,7 +2516,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
                 $new_cv->setCustomer($new_cust)
                     ->setVehicle($new_vehicle)
-                    ->setPlateNumber($req->request->get('cv_plate'))
+                    ->setPlateNumber(trim($req->request->get('cv_plate')))
                     ->setModelYear($req->request->get('cv_year'))
                     ->setColor('')
                     ->setStatusCondition('')
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 7d2344f2..c3ad623f 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -415,7 +415,6 @@
                                                         <th>Branch</th>
                                                         <th>Contact Numbers</th>
                                                         <th>Distance in KM</th>
-                                                        <th>Action</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody id="nearest_hubs">
@@ -425,7 +424,6 @@
                                                         <td>{{ hub.hub.getName }}</td>
                                                         <td>{{ hub.hub.getBranch }}</td>
                                                         <td>{{ hub.hub.getContactNumbers }}</td>
-                                                        <td></span></td>
                                                         <td></td>
                                                     {% endfor %}
                                                 {% endif %} -->
@@ -462,14 +460,13 @@
                                                         <th>Last Name</th>
                                                         <th>Contact No.</th>
                                                         <th>Plate Number</th>
-                                                        <th>Action</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody id="riders">
                                                 {% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %}
                                                     {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
                                                     <tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}">
-                                                        <td colspan="5">
+                                                        <td colspan="4">
                                                             No riders available.
                                                         </td>
                                                     </tr>
@@ -765,7 +762,6 @@ $(function() {
                     hub_table += '<td>' + hub['branch'] + '</td>';
                     hub_table += '<td>' + hub['cnum'] + '</td>';
                     hub_table += '<td>' + hub['distance'] + '</td>';
-                    hub_table += '<td></td>';
                     hub_table += '</tr>';
                 }
 
@@ -794,7 +790,6 @@ $(function() {
                     hub_table += '<td>' + hub['branch'] + '</td>';
                     hub_table += '<td>' + hub['cnum'] + '</td>';
                     hub_table += '<td>' + hub['distance'] + '</td>';
-                    hub_table += '<td></td>';
                     hub_table += '</tr>';
 
                 }
@@ -820,7 +815,6 @@ $(function() {
                         hub_table += '<td>' + hub['branch'] + '</td>';
                         hub_table += '<td>' + hub['cnum'] + '</td>';
                         hub_table += '<td>' + hub['distance'] + '</td>';
-                        hub_table += '<td></td>';
                         hub_table += '</tr>';
                     }
                 }
@@ -931,7 +925,6 @@ $(function() {
                             rider_table += '<td>' + rider['last_name'] + '</td>';
                             rider_table += '<td>' + rider['contact_num'] + '</td>';
                             rider_table += '<td>' + rider['plate_num'] + '</td>';
-                            rider_table += '<td></td>';
                             rider_table += '</tr>';
                         }
 
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index e628d93b..fa9104af 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -357,8 +357,6 @@
                                                         <th>Hub</th>
                                                         <th>Branch</th>
                                                         <th>Contact Numbers</th>
-                                                        <th>Distance in KM</th>
-                                                        <th>Action</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody id="nearest_hubs">
@@ -367,16 +365,12 @@
                                                         <td>{{ obj.getHub.getName }}</td>
                                                         <td>{{ obj.getHub.getBranch }}</td>
                                                         <td>{{ obj.getHub.getContactNumbers }}</td>
-                                                        <td></span></td>
-                                                        <td></td>
                                                     {% else %}
                                                         {% for hub in hubs %}
                                                             <tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}>
                                                             <td>{{ hub.getName }}</td>
                                                             <td>{{ hub.getBranch }}</td>
                                                             <td>{{ hub.getContactNumbers }}</td>
-                                                            <td></span></td>
-                                                            <td></td>
                                                         {% endfor %}
                                                     {% endif %}
                                                 </tbody>