diff --git a/public/Forwarder/deliveryarrange.html b/public/Forwarder/deliveryarrange.html
index 251c3ec..de924ae 100644
--- a/public/Forwarder/deliveryarrange.html
+++ b/public/Forwarder/deliveryarrange.html
@@ -53,18 +53,30 @@ License: You must have a valid license purchased only from themeforest(the above
         }
         .table td,
         .table th {
-            font-size: 10px;
+            font-size: 9px;
             text-align: center;
             vertical-align: middle;
+            padding-left: 5px;
+            padding-right: 10px;
+        }
+        .dropdown-menu {
+            min-width: 10px;
+        }
+        .dropdown-menu>li>a {
+            padding-left: 4px;
+            padding-right: 5px;
+            font-size: 10px;
         }
         .dataTables_wrapper .dataTables_filter {
             float: left;
             text-align: right;
         }
         .table thead tr th {
-            font-size: 10px;
+            font-size: 9px;
             text-align: center;
             vertical-align: middle;
+            padding-left: 5px;
+            padding-right: 10px;
         }
         .filterIcon {
             height: 10px;
@@ -429,8 +441,8 @@ License: You must have a valid license purchased only from themeforest(the above
 
                                         <div class="table-container">
 
-                                            
-                                            <table id="example" class="table table-striped table-bordered table-hover order-column"></table>
+
+                                            <table id="example" class="table table-bordered order-column"></table>
 
                                         </div>
                                         <h5>Total item:10</h5>
@@ -443,155 +455,159 @@ License: You must have a valid license purchased only from themeforest(the above
                                 <!-- End: life time stats -->
                             </div>
                         </div>
-                        <!-- END CONTENT -->
-                        <div class="modal fade modal-scroll bs-modal-lg in" id="form_delivery" tabindex="-1" role="basic" aria-hidden="true">
-                            <div class="modal-dialog modal-lg">
-                                <div class="modal-content">
-                                    <div class="modal-header" style="background-color: #3598dc">
-                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- END CONTENT -->
+        <div class="modal fade modal-scroll bs-modal-lg in" id="form_delivery" tabindex="-1" role="basic" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header" style="background-color: #3598dc">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+                        <div class="caption" style="color: #FFF;padding: 11px 0 9px;float: left;display: inline-block;font-size: 18px;line-height: 18px;font-family:'Open Sans',sans-serif;">
+                            <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Delivery Arrangement
+                        </div>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="col-md-12">
+                                        <div class="form-group">
+                                            <label>Delivery Type</label>
+                                            <select id="type" class="form-control" onchange="show_hide(this);">
+                                                <option value=""> Please Select</option>
+                                                <option value="1"> Inhouse Services</option>
+                                                <option value="2"> Courier Service</option>
+                                                <option value="3"> Outsource Service</option>
+                                                <option value="4"> Self Collect</option>
+                                            </select>
 
-                                        <div class="caption" style="color: #FFF;padding: 11px 0 9px;float: left;display: inline-block;font-size: 18px;line-height: 18px;font-family:'Open Sans',sans-serif;">
-                                            <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Delivery Arrangement
                                         </div>
                                     </div>
-                                    <div class="modal-body">
-                                        <div class="form">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="col-md-12">
-                                                        <div class="form-group">
-                                                            <label>Delivery Type</label>
-                                                            <select id="type" class="form-control" onchange="show_hide(this);">
-                                                                <option value=""> Please Select</option>
-                                                                <option value="1"> Inhouse Services</option>
-                                                                <option value="2"> Courier Service</option>
-                                                                <option value="3"> Outsource Service</option>
-                                                                <option value="4"> Self Collect</option>
-                                                            </select>
+                                </div>
+                            </div>
+                        </div>
 
-                                                        </div>
-                                                    </div>
-                                                </div>
+                        <div id="own_transport" style="display:none">
+                            <h5>Driver Details</h5>
+                            <hr>
+                            <div class="form">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Delivery Date</label>
+                                                <input class="form-control">
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Driver Name</label>
+                                                <input class="form-control">
                                             </div>
                                         </div>
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Driver Contact</label>
+                                                <input class="form-control">
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Vehicle No</label>
+                                                <input class="form-control">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="courier" style="display:none">
+                            <h5>Courier Details</h5>
+                            <hr>
+                            <div class="form">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Courier Service Name</label>
+                                                <input class="form-control">
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Tracking Number</label>
+                                                <input class="form-control">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="self_collect" style="display:none">
+                            <h5>Self Collect Details</h5>
+                            <hr>
+                            <div class="form">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Warehouse</label>
+                                                <select id="warehouse" class="form-control">
+                                                    <option> Please Select / Create New</option>
+                                                    <option value="WHA">Warehouse A</option>
+                                                    <option value="WHB">Warehouse B</option>
+                                                    <option value="WHC">Warehouse C</option>
+                                                    <option value="WHD">Warehouse D</option>
+                                                </select>
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Contact Person Name</label>
+                                                <input id="contact" class="form-control" value="" />
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Contact Person No.</label>
+                                                <input id="contactno" class="form-control" value="" />
+                                            </div>
+                                        </div>
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Address</label>
+                                                <textarea id="address" class="form-control"></textarea>
+                                            </div>
+                                            <div class="form-group">
+                                                <label>City</label>
+                                                <input id="city" class="form-control" value="" />
+                                            </div>
+                                            <div class="form-group">
+                                                <label>State</label>
+                                                <input id="state" class="form-control" value="" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
 
-                                        <div id="own_transport" style="display:none">
-                                            <h5>Driver Details</h5>
-                                            <hr>
-                                            <div class="form">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-6">
-                                                            <div class="form-group">
-                                                                <label>Delivery Date</label>
-                                                                <input class="form-control">
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>Driver Name</label>
-                                                                <input class="form-control">
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-6">
-                                                            <div class="form-group">
-                                                                <label>Driver Contact</label>
-                                                                <input class="form-control">
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>Vehicle No</label>
-                                                                <input class="form-control">
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div id="courier" style="display:none">
-                                            <h5>Courier Details</h5>
-                                            <hr>
-                                            <div class="form">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-6">
-                                                            <div class="form-group">
-                                                                <label>Courier Service Name</label>
-                                                                <input class="form-control">
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>Tracking Number</label>
-                                                                <input class="form-control">
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div id="self_collect" style="display:none">
-                                            <h5>Self Collect Details</h5>
-                                            <hr>
-                                            <div class="form">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-6">
-                                                            <div class="form-group">
-                                                                <label>Warehouse</label>
-                                                                <select id="warehouse" class="form-control">
-                                                                    <option> Please Select / Create New</option>
-                                                                    <option value="WHA">Warehouse A</option>
-                                                                    <option value="WHB">Warehouse B</option>
-                                                                    <option value="WHC">Warehouse C</option>
-                                                                    <option value="WHD">Warehouse D</option>
-                                                                </select>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>Contact Person Name</label>
-                                                                <input id="contact" class="form-control" value="" />
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>Contact Person No.</label>
-                                                                <input id="contactno" class="form-control" value="" />
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-6">
-                                                            <div class="form-group">
-                                                                <label>Address</label>
-                                                                <textarea id="address" class="form-control"></textarea>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>City</label>
-                                                                <input id="city" class="form-control" value="" />
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>State</label>
-                                                                <input id="state" class="form-control" value="" />
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
+                        <h5>Order Details</h5>
+                        <hr>
+                        <div class="table-container">
 
-                                        <h5>Order Details</h5>
+                            <div id="mask"></div>
+                            <table id="example2" class="table table-striped table-bordered table-hover"></table>
+                            <!--<input name="total" id="total" type="text"  value=0 />-->
+                            <!--<p id="total" class="form-control-static"> </p>-->
+
+                            <h5>Total CBM: </h5>
+                            <h5>Total Carton: </h5>
+                            <h5>Total Weight: </h5>
+                            <br>
+                            <div class="form">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <h5>Notification</h5>
                                         <hr>
-                                        <div class="table-container">
-
-                                            <div id="mask"></div>
-                                            <table id="example2" class="table table-striped table-bordered table-hover"></table>
-                                            <!--<input name="total" id="total" type="text"  value=0 />-->
-                                            <!--<p id="total" class="form-control-static"> </p>-->
-
-                                            <h5>Total CBM: </h5>
-                                            <h5>Total Carton: </h5>
-                                            <h5>Total Weight: </h5>
-                                            <br>
-                                            <div class="form">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <h5>Notification</h5>
-                                                        <hr>
-                                                        <div class="form-group">
-                                                            <div class="row">
-                                                                <div class="col-md-10">
-                                                                    <textarea id="message" class="form-control" rows="10">
+                                        <div class="form-group">
+                                            <div class="row">
+                                                <div class="col-md-10">
+<textarea id="message" class="form-control" rows="10">
 Delivery Request
 
 Order No: #[ORDER NO] 
@@ -612,63 +628,212 @@ Thank You Very Much.
 
 [Forwarder Company Name]
 </textarea>
-                                                                </div>
-                                                                <div class="col-md-2">
-                                                                    <a href="chat.html" class="btn green" onclick="confirm('Your delivery arrangement are send via Messenger and SMS to Importer Admin account. Please ask your importer to confirm your arrangement.')"><i class="fa fa-comments-o"></i> Send</a>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
+                                                </div>
+                                                <div class="col-md-2">
+                                                    <a href="chat.html" class="btn green" onclick="confirm('Your delivery arrangement are send via Messenger and SMS to Importer Admin account. Please ask your importer to confirm your arrangement.')"><i class="fa fa-comments-o"></i> Send</a>
                                                 </div>
                                             </div>
-
                                         </div>
                                     </div>
-                                    <!-- /.modal-content -->
                                 </div>
-                                <!-- /.modal-dialog -->
                             </div>
 
-                            <div class="modal fade in" id="reason" tabindex="-1" role="basic" aria-hidden="true">
-                                <div class="modal-dialog">
-                                    <div class="modal-content">
-                                        <div class="modal-header" style="background-color: #3598dc">
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+                        </div>
+                    </div>
+                    <!-- /.modal-content -->
+                </div>
+                <!-- /.modal-dialog -->
+            </div>
+        </div>
 
-                                            <div class="caption" style="color: #FFF;padding: 11px 0 9px;float: left;display: inline-block;font-size: 18px;line-height: 18px;font-family:'Open Sans',sans-serif;">
-                                                <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Failed Delivery
-                                            </div>
-                                        </div>
-                                        <div class="modal-body">
-                                            <div class="form">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <div class="form-group">
-                                                            <label>Title</label>
-                                                            <input class="form-control">
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label>Reason</label>
-                                                            <textarea class="form-control" rows="3"></textarea>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="modal-footer">
-                                            <button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
-                                            <button type="button" class="btn green">Send</button>
+        <div class="modal fade in" id="reason" tabindex="-1" role="basic" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header" style="background-color: #3598dc">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+                        <div class="caption" style="color: #FFF;padding: 11px 0 9px;float: left;display: inline-block;font-size: 18px;line-height: 18px;font-family:'Open Sans',sans-serif;">
+                            <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Failed Delivery
+                        </div>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="form-group">
+                                        <label>Title</label>
+                                        <input class="form-control">
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Reason</label>
+                                        <textarea class="form-control" rows="3"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn green">Send</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="modal fade modal-scroll bs-modal-lg in" id="boxes" tabindex="-1" role="basic" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header" style="background-color: #3598dc">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+                        <div class="caption" style="color: #FFF;padding: 11px 0 9px;float: left;display: inline-block;font-size: 18px;line-height: 18px;font-family:'Open Sans',sans-serif;">
+                            <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Delivery Details
+                        </div>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="col-md-12">
+                                        <div class="form-group">
+                                            <label>Delivery Type</label>
+                                            <p class="form-control-static">: Inhouse Services</p>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <!-- END CONTENT BODY -->
+
+                        <div id="own_transport">
+                            <h5>Driver Details</h5>
+                            <hr>
+                            <div class="form">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Delivery Date</label>
+                                                <p class="form-control-static">: 03-07-2017</p>
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Driver Name</label>
+                                                <p class="form-control-static">: Samad</p>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-6">
+                                            <div class="form-group">
+                                                <label>Driver Contact</label>
+                                                <p class="form-control-static">: 012345689</p>
+                                            </div>
+                                            <div class="form-group">
+                                                <label>Vehicle No</label>
+                                                <p class="form-control-static">: JNY1122</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <h5>Order Details</h5>
+                        <hr>
+                        <div class="table-container">
+
+                            <div id="mask"></div>
+                            <table id="example3" class="table table-striped table-bordered table-hover">
+                                <tbody>
+                                    <tr role="row" class="odd">
+                                        <td class="col_1 sorting_1">1</td>
+                                        <td class=" col_2">03-08-2017</td>
+                                        <td class=" col_3">CTN56</td>
+                                        <td class=" col_4">00006</td>
+                                        <td class=" col_5">CIEF/0008</td>
+                                        <td class=" col_6">Bangi
+                                            <br>Selangor</td>
+                                        <td class=" col_7">Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7</td>
+                                        <td class=" col_8">CBM :
+                                            <br>Weight:
+                                            <br>Qty of Carton:</td>
+                                    </tr>
+                                    <tr role="row" class="even">
+                                        <td class="col_1 sorting_1">2</td>
+                                        <td class=" col_2">03-08-2017</td>
+                                        <td class=" col_3">CTN55</td>
+                                        <td class=" col_4">00005</td>
+                                        <td class=" col_5">CIEF/0007</td>
+                                        <td class=" col_6">Bangi
+                                            <br>Selangor</td>
+                                        <td class=" col_7">Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7</td>
+                                        <td class=" col_8">CBM :
+                                            <br>Weight:
+                                            <br>Qty of Carton:</td>
+                                    </tr>
+                                    <tr role="row" class="odd">
+                                        <td class="col_1 sorting_1">3</td>
+                                        <td class=" col_2">03-08-2017</td>
+                                        <td class=" col_3">CTN54</td>
+                                        <td class=" col_4">00004</td>
+                                        <td class=" col_5">CIEF/0006</td>
+                                        <td class=" col_6">Bangi
+                                            <br>Selangor</td>
+                                        <td class=" col_7">Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7</td>
+                                        <td class=" col_8">CBM :
+                                            <br>Weight:
+                                            <br>Qty of Carton:</td>
+                                    </tr>
+                                    <tr role="row" class="even">
+                                        <td class="col_1 sorting_1">4</td>
+                                        <td class=" col_2">03-08-2017</td>
+                                        <td class=" col_3">CTN53</td>
+                                        <td class=" col_4">00003</td>
+                                        <td class=" col_5">CIEF/0005</td>
+                                        <td class=" col_6">Bangi
+                                            <br>Selangor</td>
+                                        <td class=" col_7">Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7</td>
+                                        <td class=" col_8">CBM :
+                                            <br>Weight:
+                                            <br>Qty of Carton:</td>
+                                    </tr>
+                                    <tr role="row" class="odd">
+                                        <td class="col_1 sorting_1">5</td>
+                                        <td class=" col_2">03-08-2017</td>
+                                        <td class=" col_3">CTN52</td>
+                                        <td class=" col_4">00002</td>
+                                        <td class=" col_5">CIEF/0004</td>
+                                        <td class=" col_6">Bangi
+                                            <br>Selangor</td>
+                                        <td class=" col_7">Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7</td>
+                                        <td class=" col_8">CBM :
+                                            <br>Weight:
+                                            <br>Qty of Carton:</td>
+                                    </tr>
+                                    <tr role="row" class="even">
+                                        <td class="col_1 sorting_1">6</td>
+                                        <td class=" col_2">03-08-2017</td>
+                                        <td class=" col_3">CTN51</td>
+                                        <td class=" col_4">00001</td>
+                                        <td class=" col_5">CIEF/0003</td>
+                                        <td class=" col_6">Bangi
+                                            <br>Selangor</td>
+                                        <td class=" col_7">Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7</td>
+                                        <td class=" col_8">CBM :
+                                            <br>Weight:
+                                            <br>Qty of Carton:</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <h5>Total CBM: 24.78 </h5>
+                            <h5>Total Carton: 10 </h5>
+                            <h5>Total Weight: 250kg </h5>
+                            <br>
+                        </div>
                     </div>
-                    <!-- END CONTENT -->
+                    <!-- /.modal-content -->
                 </div>
+                <!-- /.modal-dialog -->
             </div>
         </div>
+
         <!-- END CONTAINER -->
         <!-- BEGIN FOOTER -->
         <div class="page-footer">
@@ -717,14 +882,15 @@ Thank You Very Much.
 
 
             var dataSet = [
-                ["1", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00006 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0008", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "10", "", "Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
-                ["2", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00005 </a>", "CIEF/0007", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "14", "", "Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
-                ["3", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00004 </a>", "CIEF/0006", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "23", "", "Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
-                ["4", "03-07-2017", "Vehicle No:JNY1122<br/>Contact Person:Handsome<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00003 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0005", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "12", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
-                ["5", "03-07-2017", "Vehicle No:JNY1122<br/>Contact Person:Hantam<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00002 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0005", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "23", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
-                ["6", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "21", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
-                ["7", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "16", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"],
-                ["8", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "11", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"]
+                ["1", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00006 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0008", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "10", "", "Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li></ul></div>"],
+                ["2", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00005 </a>", "CIEF/0007", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "14", "", "Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li></ul></div>"],
+                ["3", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00004 </a>", "CIEF/0006", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "23", "", "Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li></ul></div>"],
+                ["4", "03-07-2017", "Vehicle No:JNY1122<br/>Contact Person:Handsome<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00003 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0005", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "12", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li><li><a href='#reason' data-toggle='modal'>Fail to Deliver</a></li></ul></div>"],
+                ["5", "03-07-2017", "Vehicle No:JNY1122<br/>Contact Person:Hantam<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00002 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0005", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "23", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li><li><a href='#reason' data-toggle='modal'>Fail to Deliver</a></li></ul></div>"],
+                ["6", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "21", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li><li><a href='#reason' data-toggle='modal'>Fail to Deliver</a></li></ul></div>"],
+                ["7", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "16", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li></ul></div>"],
+                ["8", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "11", "", "Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li></ul></div>"],
+                ["8", "03-07-2017", "Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689", "<a class='chat_link' href='chat.html'> 00000 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>", "CIEF/0003", "CTN56", "Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789", "Bangi<br>Selangor", "123456", "11", "", "Order <span class='font-green-jungle' style='font-weight: 700;'>Closed</span>", "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a  data-toggle='modal' href='#boxes'>View </a></li></ul></div>"]
             ];
 
             var dataSet2 = [
@@ -752,9 +918,6 @@ Thank You Very Much.
                 "columnDefs": [{ // set default column settings
                     'orderable': false,
                     'targets': [0]
-                }, {
-                    "targets": [12],
-                    "visible": false
                 }],
                 // scroller extension: http://datatables.net/extensions/scroller/
                 scrollY: 300,
@@ -833,12 +996,14 @@ Thank You Very Much.
                 }, {
                     title: 'Status<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_11\')"></span>'
                 }, {
-                    title: 'Stats'
-                }, ],
+                    title: 'Actions'
+                }],
 
                 initComplete: function() {
                     configFilter(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
-                }
+                },
+                "sScrollX": "100%",
+                "bScrollCollapse": true
             });
 
             $('#example2').DataTable({
@@ -927,16 +1092,6 @@ Thank You Very Much.
                     configFilter(this, [2, 3, 4, 5, 6, 7, 8, 9]);
                 }
             });
-            table1.columns(12).search('Not Completed').draw();
-            $('.asdasd').on('switchChange.bootstrapSwitch', function(event, state) {
-                if (state == true) {
-                    table1.columns(12).search('Not Completed').draw();
-                } else {
-                    table1.columns(12).search('Completed').draw();
-
-                }
-
-            });
             existingdiv1 = document.getElementById("switch");
             $("div.toolbar2").append(existingdiv1);
             $("div.toolbar").html('Total Delivery : <p id="total" class="form-control-static">0</p>');
diff --git a/public/Forwarder/team.html b/public/Forwarder/team.html
index 7f325e2..1c85dfa 100644
--- a/public/Forwarder/team.html
+++ b/public/Forwarder/team.html
@@ -340,7 +340,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         <ul class="nav">
                                             <li>
                                                 <a href="profile.html">
-                                                    <i class="icon-settings"></i> Profile Settings </a>
+                                                    <i class="icon-settings"></i> Personal Settings </a>
                                             </li>
                                             <li class="active">
                                                 <a href="team.html">
diff --git a/public/Importer/index.html b/public/Importer/index.html
index 332844f..08075cc 100644
--- a/public/Importer/index.html
+++ b/public/Importer/index.html
@@ -222,12 +222,6 @@ License: You must have a valid license purchased only from themeforest(the above
 											<span class="title">Shipping Order</span>
 										</a>
 									</li>
-									<li class="nav-item  ">
-										<a href="opendraft.html" class="nav-link ">
-											<i class="icon-envelope"></i>
-											<span class="title">Open Draft</span>
-										</a>
-									</li>
 								</ul>
 							</li>
 							<li class="nav-item ">
@@ -256,11 +250,11 @@ License: You must have a valid license purchased only from themeforest(the above
                         <div class="page-bar">
                             <ul class="page-breadcrumb">
                                 <li>
-                                    <a href="index.html">Order Status</a>
+                                    <a href="index.html">Home</a>
                                     <i class="fa fa-circle"></i>
                                 </li>
                                 <li>
-                                    <a  href="chat.html">Messenger</a>
+                                    <a  href="index.html">Order Status</a>
                                 </li>
                             </ul>
                         </div>
diff --git a/public/Importer/team.html b/public/Importer/team.html
index a84167c..3b8449c 100644
--- a/public/Importer/team.html
+++ b/public/Importer/team.html
@@ -288,7 +288,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <ul class="nav">
                                                 <li>
                                                     <a href="profile.html">
-                                                        <i class="icon-settings"></i> Profile Settings </a>
+                                                        <i class="icon-settings"></i> Personal Settings </a>
                                                 </li>
                                                 <li  class="active">
                                                     <a href="team.html">