diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
index 540f926c..0333a75f 100644
--- a/templates/job-order/form.onestep.html.twig
+++ b/templates/job-order/form.onestep.html.twig
@@ -388,6 +388,34 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="m-form__heading">
+                                    <h3 class="m-form__heading-title">
+                                        Rider Assignment
+                                    </h3>
+                                </div>
+                                <div class="form-group m-form__group row">
+                                    <div class="col-lg-12">
+                                        <label>Click on a row to select a rider</label>
+                                        <div class="form-control-feedback hide" data-field="rider"></div>
+                                        <div class="table-frame" data-name="rider">
+                                            <table id="riderss-table" class="table table-compact table-hover table-clickable m-table">
+                                                <thead>
+                                                    <tr>
+                                                        <th>First Name</th>
+                                                        <th>Last Name</th>
+                                                        <th>Contact No.</th>
+                                                        <th>Plate Number</th>
+                                                        <th>Status</th>
+                                                        <th>Action</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="riders">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
 
 							<div class="m-form__seperator m-form__seperator--dashed"></div>
 							<div class="m-form__section{{ ftags.invoice_edit ? ' m-form__section--last' }}">
@@ -914,6 +942,8 @@ $(function() {
 
             // set hub
             selectedHub = id;
+
+            // get riders of hub
         });
     });