diff --git a/Forwarder/deliveryarrange.html b/Forwarder/deliveryarrange.html
index adc58c3..58e4996 100644
--- a/Forwarder/deliveryarrange.html
+++ b/Forwarder/deliveryarrange.html
@@ -48,16 +48,17 @@ License: You must have a valid license purchased only from themeforest(the above
         <link href="../assets/layouts/layout/css/custom.min.css" rel="stylesheet" type="text/css" />
         <!-- END THEME LAYOUT STYLES -->
 		<style>
-.table td, .table th {
-    font-size: 10px;
-	text-align:center;
-	vertical-align: middle;
-}
-.table thead tr th{
-    font-size: 10px;
-	text-align:center;
-	vertical-align: middle;
-}
+
+		.table td, .table th {
+			font-size: 10px;
+			text-align:center;
+			vertical-align: middle;
+		}
+		.table thead tr th{
+			font-size: 10px;
+			text-align:center;
+			vertical-align: middle;
+		}
 div.dt-button-collection{
 margin-top: 100px;
 }
@@ -269,14 +270,19 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                 <div class="portlet box green">
                                     <div class="portlet-title">
                                         <div class="caption">
-                                            <i class="fa fa-cogs"></i><strong>Delivery Arrangement</strong> </div>
+                                            <i class="fa fa-cogs"></i><strong>Delivery Arrangement Status</strong> </div>
                                         <div class="actions">
+											<div class="btn-group">
+												<a class="btn white btn-outline btn-circle" href="#form_delivery" data-toggle="modal" > Arrange Delivery
+												</a>
+											</div>
                                             <div class="btn-group">
                                                 <a class="btn white btn-outline btn-circle" href="javascript:;" data-toggle="dropdown">
                                                     <i class="fa fa-share"></i>
                                                     <span class="hidden-xs"> Actions </span>
                                                     <i class="fa fa-angle-down"></i>
                                                 </a>
+												
                                                 <ul class="dropdown-menu pull-right" id="sample_3_tools">
                                                     <li>
                                                         <a href="javascript:;" data-action="0" class="tool-action">
@@ -303,7 +309,6 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                                         <a href="javascript:;" data-action="5" class="tool-action">
                                                             <i class="icon-refresh"></i> Reload</a>
                                                     </li>
-                                                    </li>
                                                 </ul>
                                             </div>
                                         </div>
@@ -314,8 +319,8 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                             <table style="" class="table table-striped table-bordered table-hover" id="sample_3">
                                                 <thead>
                                                     <tr>
-                                                        <th width="1%"> No </th>
-														<th  width="5%"> Date <br/>
+                                                        <th> No </th>
+														<th> Delivery Date <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
@@ -328,16 +333,17 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
 																<li>
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Order Number"> Status </a> <br/>
+                                                        <th> Driver Details </th>
+														<th> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Order Number"> Status </a> <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
 															  <li><input onchange="filterme()" name="status" value="Warehouse Received" type="checkbox"/>&nbsp;Warehouse Received</li>														  
 															  <li><input onchange="filterme()" name="status" value="Container loading" type="checkbox"/>&nbsp;Container loading</li>														  
 															  <li><input onchange="filterme()" name="status" value="ETD" type="checkbox"/>&nbsp;ETD</li>					
-														  </ul>
+															</ul>
 														</th>
-														<th width="2%"> Order No <br/>
+														<th> Order No <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
@@ -349,7 +355,7 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
 															</ul>
 														</th>
 														
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Customer Code"> Cust<br/> Code </a> <br/>
+														<th> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Customer Code"> Cust<br/> Code </a> <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
@@ -362,7 +368,9 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
 														</th>
 														
 														
-														<th width="1%"> Shipment<br/> No <br/>
+                                                        <th> Area </th>
+                                                        <th> State </th>
+														<th> Shipment<br/> No <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
@@ -372,21 +380,21 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
 															  <li><input onchange="filterme()" name="shipno" value="CTN53" type="checkbox"/>&nbsp;CTN53</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Container Number"> Cont<br/> No </a> <br/>
+														<th> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Container Number"> Cont<br/> No </a> <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
 															  <li><input onchange="filterme()" name="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="5%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Estimated Time of Departure"> ETD </a> <br/>
+														<th> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Estimated Time of Departure"> ETD </a> <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
 															  <li><input onchange="filterme()" name="eta" value="03-07-2017" type="checkbox"/>&nbsp;03-07-2017</li>														  
 															</ul>
 														</th>
-														<th width="5%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Estimated Time of Arrival"> ETA </a><br/>
+														<th> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Estimated Time of Arrival"> ETA </a><br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
@@ -400,21 +408,33 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
 													<tr>
                                                         <td> <center>1</center> </td>
                                                         <td> 03-07-2017 </td>
-                                                        <td> <a href="trackorder.html">Warehouse Received <i class="fa fa-pencil" aria-hidden="true"></i></a> </td>
+                                                        <td>Vehicle No : JKB1111<br/>
+															Contact Person : Samad<br/>
+															Contact No: 012345689
+														</td>
+                                                        <td>Delivery Request Sent</td>
                                                         <td> <a href="chat.html"> 00005 <span style="margin-bottom: 20px;" class="badge badge-danger">5</span></a>	 </td>
                                                         <td> CIEF/0008 </td>
                                                         <td> CTN56 </td>
+                                                        <td> Bangi </td>
+                                                        <td> Selangor </td>
 														<td> 123456 </td>
                                                         <td> 03-07-2017 </td>
                                                         <td> <span style="color:red"><strong>03-07-2017<br/>Delayed</strong></span> </td>
 													</tr>
                                                     <tr>
                                                         <td> <center>2</center> </td>
-                                                        <td> 02-07-2017 </td>
-                                                        <td> <a href="trackorder.html">Warehouse Received <i class="fa fa-pencil" aria-hidden="true"></i></a> </td>
-														<td> <a href="chat.html">00004 <span style="margin-bottom: 20px;" class="badge badge-danger">10</span></a> 	 </td>
+														<td> 03-07-2017 </td>
+														<td>Vehicle No : JKB1111<br/>
+															Contact Person : Samad<br/>
+															Contact No: 012345689
+														</td>
+                                                        <td>Delivery Request Sent</td>
+                                                        <td> <a href="chat.html">00004 <span style="margin-bottom: 20px;" class="badge badge-danger">10</span></a> 	 </td>
 														<td> CIEF/0007 </td>
                                                         <td> CTN55 </td>
+														<td> Bangi </td>
+                                                        <td> Selangor </td>
                                                         <td> 123456 </td>
                                                         <td> 03-07-2017 </td>
                                                         <td> 03-07-2017 </td>
@@ -422,10 +442,16 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                                     <tr>
                                                         <td> <center>3</center> </td>
                                                         <td> 01-07-2017 </td>
-                                                        <td> <a href="trackorder.html">Container loading <i class="fa fa-pencil" aria-hidden="true"></i></a> </td>
+														<td>Vehicle No : JKB1111<br/>
+															Contact Person : Samad<br/>
+															Contact No: 012345689
+														</td>
+                                                        <td>Delivery Arrangement Accepted</td>
 														<td> <a href="chat.html">00003</a>	 </td>
                                                         <td> CIEF/0005 </td>
                                                         <td> CTN54 </td>
+														<td>Masai </td>
+														<td> Johor </td>
                                                         <td> 123456 </td>
                                                         <td> 03-07-2017 </td>
                                                         <td> <span style="color:red"><strong>15-07-2017<br/>Delayed</strong></span> </td>
@@ -433,10 +459,16 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                                     <tr>
                                                         <td> <center>4</center> </td>
                                                         <td> 30-06-2017 </td>
-                                                        <td> <a href="trackorder.html">ETD <i class="fa fa-pencil" aria-hidden="true"></i></a> </td>
+														<td>Vehicle No : JKK2222<br/>
+															Contact Person : Handsome<br/>
+															Contact No: 012345689
+														</td>
+                                                        <td>Delivery Arrangement Accepted</td>
 														<td> <a href="chat.html">00002 <span style="margin-bottom: 20px;" class="badge badge-danger">1</span></a>	 </td>
                                                         <td> CIEF/0004 </td>
                                                         <td> CTN53 </td>
+                                                        <td> Kota Bahru </td>
+                                                        <td> Kelantan </td>
                                                         <td> 123456 </td>
                                                         <td> <span style="color:red"><strong>28-06-2017<br/>Delayed</strong> </span> </td>
                                                         <td> 03-07-2017 </td>
@@ -444,13 +476,19 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                                     <tr>
                                                         <td> <center>5</center> </td>
                                                         <td> 29-06-2017 </td>
-                                                        <td> <a href="trackorder.html">ETD <i class="fa fa-pencil" aria-hidden="true"></i></a> </td>
-														<td> <a href="chat.html">00001</a>	 </td>
+														<td>Vehicle No : JLK3333<br/>
+															Contact Person : Hantam<br/>
+															Contact No: 012345689
+														</td>
+														<td>Delivery Arrangement Accepted</td>
+                                                        <td> <a href="chat.html">00001</a>	 </td>
 														<td> CIEF/0003 </td>
-                                                        <td> N/A </td>
-                                                        <td> N/A </td>
-                                                        <td> N/A </td>
-                                                        <td> N/A </td>
+                                                        <td> CTN53 </td>
+														<td> Marang </td>
+                                                        <td> Terengganu </td>
+                                                        <td> 123456 </td>
+                                                        <td> <span style="color:red"><strong>28-06-2017<br/>Delayed</strong> </span> </td>
+                                                        <td> 03-07-2017 </td>
                                                     </tr>                                                    
                                                 </tbody>
                                             </table>
@@ -459,105 +497,21 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
                                     </div>
                                 </div>
                                 <!-- End: life time stats -->
-                            </div>
-							<div class="form-group last">
-								<label class="control-label col-md-3" align="right"></label>
-								<div class="col-md-4" align="right">
-									<a class="btn green btn-outline sbold upppercase" href="#form_delivery" data-toggle="modal" > Arrange Delivery
-									</a>
-								</div>
-							</div>
+                            </div>							
                         </div>
 						<!-- END CONTENT -->
-                        <div class="modal fade modal-scroll" id="form_delivery" tabindex="-1" role="basic" aria-hidden="true">
-							<div class="modal-dialog">
+                        <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">
+									<div class="modal-header" style="background-color: #3598dc">
 										<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-										<h5 class="modal-title">Delivery Arrangement</h5>
+										
+										<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="table-container">
-										 
-                                            <table style="" class="table table-striped table-bordered table-hover" id="sample_4">
-                                                <thead>
-                                                    <tr>
-														
-														<th style="width: 62px;">
-															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
-																<input type="checkbox" class="group-checkable" data-set="#sample_4 .checkboxes" />
-																<span></span>
-															</label>
-														</th>
-                                                        <th style="width: 136px;">No </th>
-														<th style="width: 208px;"> Date</th>
-														<th style="width: 108px;">Order No</th>
-                                                    </tr>
-                                                </thead>
-												<tbody>
-                                                    
-													<tr>
-														<td>
-															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
-															 <input type="checkbox" class="checkboxes" value="1">
-															 <span></span>
-															</label>
-														</td>
-                                                        <td> <center>1</center> </td>
-                                                        <td> 03-07-2017 </td>
-                                                        <td> 00005	 </td>                                                        
-													</tr>
-                                                    <tr>
-														<td>
-															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
-															 <input type="checkbox" class="checkboxes" value="1">
-															 <span></span>
-															</label>
-														</td>
-                                                        <td> <center>2</center> </td>
-                                                        <td> 02-07-2017 </td>
-                                                        <td> 00004 </td>
-                                                    </tr>
-                                                    <tr>
-														<td>
-															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
-															 <input type="checkbox" class="checkboxes" value="1">
-															 <span></span>
-															</label>
-														</td>
-                                                        <td> <center>3</center> </td>
-                                                        <td> 01-07-2017 </td>
-                                                        <td> 00003 </td>
-                                                    </tr>
-                                                    <tr>
-														<td>
-															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
-															 <input type="checkbox" class="checkboxes" value="1">
-															 <span></span>
-															</label>
-														</td>
-                                                        <td> <center>4</center> </td>
-                                                        <td> 30-06-2017 </td>                                                        
-                                                        <td> 00002 </td>
-                                                    </tr>
-                                                    <tr>
-														<td>
-															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
-															 <input type="checkbox" class="checkboxes" value="1">
-															 <span></span>
-															</label>
-														</td>
-                                                        <td> <center>5</center> </td>
-                                                        <td> 29-06-2017 </td>
-                                                        <td> 00001 </td>
-														
-                                                    </tr>                                                    
-                                                </tbody>
-                                            </table>
-											
-                                        </div>
-										<hr>
-										<h5>Driver Details</h5>
+									<h5>Driver Details</h5>
 										<hr>
 										<div class="form">
 											<div class="row">
@@ -583,22 +537,197 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
 														</div>
 													</div>
 												</div>
-											</div><div class="row">
+											</div>
+										</div>
+										<h5>Order Details</h5>
+										<hr>
+										<div class="table-container">
+										 
+                                            <table style="" class="table table-striped table-bordered table-hover" id="sample_4">
+                                                <thead>
+                                                    <tr>
+														
+														<th style="padding-right: 0px;padding-left: 0px;">
+															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
+																<input type="checkbox" class="group-checkable" data-set="#sample_4 .checkboxes" />
+																<span></span>
+															</label>
+														</th>
+                                                        <th style="padding-right: 10px;padding-left: 10px;">No </th>
+														<th style="padding-right: 10px;padding-left: 10px;">ETA</th>
+														<th style="padding-right: 10px;padding-left: 10px;">Shipment <br/> No
+														<br/><button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+															<span class="fa fa-filter"></span></button>
+															<ul class="dropdown-menu">
+															  <li><input onchange="filterme2()" name="shipno2" value="CTN56" type="checkbox"/>&nbsp;CTN56</li>														  
+															  <li><input onchange="filterme2()" name="shipno2" value="CTN55" type="checkbox"/>&nbsp;CTN55</li>														  
+															  <li><input onchange="filterme2()" name="shipno2" value="CTN54" type="checkbox"/>&nbsp;CTN54</li>														  
+															  <li><input onchange="filterme2()" name="shipno2" value="CTN53" type="checkbox"/>&nbsp;CTN53</li>														  
+															</ul>
+														</th>
+														<th style="padding-right: 0px;padding-left: 0px;">Order <br/>No
+														<br/><button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+														<span class="fa fa-filter"></span></button>
+														<ul class="dropdown-menu">
+														  <li><input onchange="filterme2()" name="orderno2" value="00001" type="checkbox"/>&nbsp;00001</li>
+														  <li><input onchange="filterme2()" name="orderno2" value="00002" type="checkbox"/>&nbsp;00002</li>
+														  <li><input onchange="filterme2()" name="orderno2" value="00003" type="checkbox"/>&nbsp;00003</li>
+														  <li><input onchange="filterme2()" name="orderno2" value="00004" type="checkbox"/>&nbsp;00004</li>
+														  <li><input onchange="filterme2()" name="orderno2" value="00005" type="checkbox"/>&nbsp;00005</li>															  
+														</ul>
+														</th>
+														<th style="padding-right: 0px;padding-left: 0px;">Cust <br/> Code
+														<br/><button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+														<span class="fa fa-filter"></span></button>
+														<ul class="dropdown-menu">
+														  <li><input onchange="filterme2()" name="custcode2" value="CIEF/0007" type="checkbox"/>&nbsp;CIEF/0007</li>														  
+														  <li><input onchange="filterme2()" name="custcode2" value="CIEF/0006" type="checkbox"/>&nbsp;CIEF/0006</li>														  
+														  <li><input onchange="filterme2()" name="custcode2" value="CIEF/0005" type="checkbox"/>&nbsp;CIEF/0005</li>														  
+														  <li><input onchange="filterme2()" name="custcode2" value="CIEF/0004" type="checkbox"/>&nbsp;CIEF/0004</li>														  
+														  <li><input onchange="filterme2()" name="custcode2" value="CIEF/0003" type="checkbox"/>&nbsp;CIEF/0003</li>														  
+														  <li><input onchange="filterme2()" name="custcode2" value="CIEF/0002" type="checkbox"/>&nbsp;CIEF/0002</li>														  
+														</ul>
+														</th>
+														<th style="padding-right: 0px;padding-left: 0px;">Area
+														<br/><button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+														<span class="fa fa-filter"></span></button>
+														<ul class="dropdown-menu">
+														  <li><input onchange="filterme2()" name="area2" value="Bangi" type="checkbox"/>&nbsp;Bangi</li>
+														</ul>
+														</th>
+														<th style="padding-right: 0px;padding-left: 0px;">State
+														<br/><button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+														<span class="fa fa-filter"></span></button>
+														<ul class="dropdown-menu">
+														  <li><input onchange="filterme2()" name="state2" value="Selangor" type="checkbox"/>&nbsp;Selangor</li>
+														</ul>
+														</th>
+														<th style="padding-right: 0px;padding-left: 0px;">Details</th>
+                                                    </tr>
+                                                </thead>
+												<tbody>                                                    
+													<tr>
+														<td>
+															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
+															 <input type="checkbox" class="checkboxes" value="1">
+															 <span></span>
+															</label>
+														</td>
+                                                        <td> <center>1</center> </td>
+                                                        <td> 03-08-2017 </td>
+                                                        <td> CTN56	 </td>                                                        
+                                                        <td> 00005	 </td>                                                        
+                                                        <td> CIEF/0007</td>                                                        
+                                                        <td> Bangi</td>                                                        
+                                                        <td> Selangor</td>                                                        
+                                                        <td style="text-align:left"> CBM :
+														<br/>Weight:
+														<br/>Qty of Carton:
+														</td>                                                        
+													</tr>                                                    
+													<tr>
+														<td>
+															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
+															 <input type="checkbox" class="checkboxes" value="1">
+															 <span></span>
+															</label>
+														</td>
+                                                        <td> <center>2</center> </td>
+                                                        <td>03-08-2017 </td>
+                                                        <td>CTN55</td>                                                        
+                                                        <td>00002</td>                                                        
+                                                        <td>CIEF/0006</td>                                                        
+                                                        <td>Bangi</td>                                                        
+                                                        <td>Selangor</td>                                                        
+                                                        <td style="text-align:left"> CBM :
+														<br/>Weight:
+														<br/>Qty of Carton:
+														</td>                                                        
+													</tr>                                                    
+													<tr>
+														<td>
+															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
+															 <input type="checkbox" class="checkboxes" value="1">
+															 <span></span>
+															</label>
+														</td>
+                                                        <td><center>3</center> </td>
+                                                        <td>03-08-2017</td>
+                                                        <td>CTN54</td>                                                        
+                                                        <td>00003</td>                                                        
+                                                        <td>CIEF/0005</td>                                                        
+                                                        <td>Bangi</td>                                                        
+                                                        <td>Selangor</td>                                                        
+                                                        <td style="text-align:left"> CBM :
+														<br/>Weight:
+														<br/>Qty of Carton:
+														</td>                                                        
+													</tr>                                                    
+													<tr>
+														<td>
+															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
+															 <input type="checkbox" class="checkboxes" value="1">
+															 <span></span>
+															</label>
+														</td>
+                                                        <td><center>4</center> </td>
+                                                        <td>03-08-2017</td>
+                                                        <td>CTN53</td>                                                        
+                                                        <td>00004</td>                                                        
+                                                        <td>CIEF/0004</td>                                                        
+                                                        <td>Bangi</td>                                                        
+                                                        <td>Selangor</td>                                                        
+                                                        <td style="text-align:left"> CBM :
+														<br/>Weight:
+														<br/>Qty of Carton:
+														</td>                                                        
+													</tr>                                                    
+													<tr>
+														<td>
+															<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
+															 <input type="checkbox" class="checkboxes" value="1">
+															 <span></span>
+															</label>
+														</td>
+                                                        <td><center>5</center></td>  
+                                                        <td>03-08-2017</td>
+                                                        <td>CTN52</td>                                                        
+                                                        <td>00001</td>                                                        
+                                                        <td>CIEF/0003</td>                                                        
+                                                        <td>Bangi</td>                                                        
+                                                        <td>Selangor</td>                                                        
+                                                        <td style="text-align:left"> CBM :
+														<br/>Weight:
+														<br/>Qty of Carton:
+														</td>                                                        
+													</tr>                                                
+                                                </tbody>
+                                            </table>
+											
+                                        </div>
+										<div class="form">
+											<div class="row">
 												<div class="col-md-12">
+														<h5>Message</h5>
+														<hr>
 													<div class="form-group">
-														<label>Message</label>
-														<textarea class="form-control" rows="5">Hi Bella, Your order has been proceed. Here is your order no 0005 on date 03-07-2017. You able to contact the driver Bob (013-3456789) and vehicle no WAA 123 C. Thank you.</textarea>
+														<div class="row">
+															<div class="col-md-10">
+																<textarea class="form-control" rows="5">Hi Bella, Your order has been proceed. Here is your order no 0005 on date 03-07-2017. You able to contact the driver Bob (013-3456789) and vehicle no WAA 123 C. Thank you.</textarea>
+															</div>
+															<div class="col-md-2">
+																<button type="button" 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</button>
+															</div>
+														</div>
 													</div>
 												</div>
 											</div>
 										</div>
-									
-                                        
 
 									</div>
 									<div class="modal-footer">
 										<button type="button" class="btn dark btn-outline" data-dismiss="modal">Close</button>
-										<button type="button" class="btn green"><i class="fa fa-comments-o"></i> Send</button>
+										
 									</div>
 								</div>
 								<!-- /.modal-content -->
diff --git a/assets/pages/scripts/table-datatables-buttons.js b/assets/pages/scripts/table-datatables-buttons.js
index 0229813..c3b7d5c 100644
--- a/assets/pages/scripts/table-datatables-buttons.js
+++ b/assets/pages/scripts/table-datatables-buttons.js
@@ -90,7 +90,7 @@ $(function() {
 		  otable.DataTable().draw();
 		});
 
-		$('#my-table_filter').hide();
+		// $('#my-table_filter').hide();  
         // handle datatable custom tools
         $('#sample_3_tools > li > a.tool-action').on('click', function() {
             var action = $(this).attr('data-action');
@@ -186,7 +186,9 @@ $(function() {
             //   url: '//cdn.datatables.net/plug-ins/3cfcc339e89/i18n/Portuguese.json'
             //},
 			"bInfo" : false,
-			"paging": false,
+			"bFilter" : false,               
+			"bLengthChange": false,
+			// "paging": false,
 			 columnDefs: [
 				{ "orderable": false, "targets": 0 }
 			  ],
@@ -215,11 +217,11 @@ $(function() {
             ],
             
             "lengthMenu": [
-                [3, 10, 15, 20, -1],
-                [3, 10, 15, 20, "All"] // change per page values here
+                [5, 10, 15, 20, -1],
+                [5, 10, 15, 20, "All"] // change per page values here
             ],
             // set the initial value
-            "pageLength": 3,
+            "pageLength": 20,
 
 			
             //"dom": "<'row' <'col-md-12'>><'row'<'col-md-6 col-sm-12'l><'col-md-6 col-sm-12'f>r><'table-scrollable't><'row'<'col-md-5 col-sm-12'i><'col-md-7 col-sm-12'p>>", // horizobtal scrollable datatable
@@ -278,65 +280,66 @@ $(function() {
         });
 })
 function filterme2() {
-  //build a regex filter string with an or(|) condition
-  var types = $('input:checkbox[name="date"]:checked').map(function() {
-    return '^' + this.value + '\$';
-  }).get().join('|');
-  //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(types, 1, true, false, false, false); 
+  // //build a regex filter string with an or(|) condition
+  // var types = $('input:checkbox[name="date"]:checked').map(function() {
+    // return '^' + this.value + '\$';
+  // }).get().join('|');
+  // //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(types, 1, true, false, false, false); 
   
-  var types = $('input:checkbox[name="type"]:checked').map(function() {
-    return '^' + this.value + '\$';
-  }).get().join('|');
-  //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(types, 3, true, false, false, false);
+  // var types = $('input:checkbox[name="type"]:checked').map(function() {
+    // return '^' + this.value + '\$';
+  // }).get().join('|');
+  // //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(types, 3, true, false, false, false);
 
+  // //build a filter string with an or(|) condition
+  // var frees = $('input:checkbox[name="orderno"]:checked').map(function() {
+    // return this.value;
+  // }).get().join('|');
+  // //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(frees, 4, true, false, false, false);
+  
+  // //build a filter string with an or(|) condition
+  // var frees = $('input:checkbox[name="suppliercode"]:checked').map(function() {
+    // return this.value;
+  // }).get().join('|');
+  // //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(frees, 5, true, false, false, false);
+  
+  // //build a filter string with an or(|) condition
+  // var frees = $('input:checkbox[name="custcode"]:checked').map(function() {
+    // return this.value;
+  // }).get().join('|');
+  // //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(frees, 6, true, false, false, false);
+  
+  // //build a filter string with an or(|) condition
+  // var frees = $('input:checkbox[name="pvalue"]:checked').map(function() {
+    // return this.value;
+  // }).get().join('|');
+  // //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(frees, 7, true, false, false, false);
+  
   //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="orderno"]:checked').map(function() {
+  var frees = $('input:checkbox[name="shipno2"]:checked').map(function() {
+	  alert(this.value);
     return this.value;
   }).get().join('|');
   //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
   otable2.fnFilter(frees, 4, true, false, false, false);
   
-  //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="suppliercode"]:checked').map(function() {
-    return this.value;
-  }).get().join('|');
-  //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(frees, 5, true, false, false, false);
+  // //build a filter string with an or(|) condition
+  // var frees = $('input:checkbox[name="eta"]:checked').map(function() {
+    // return this.value;
+  // }).get().join('|');
+  // //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(frees, 10, true, false, false, false);
   
-  //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="custcode"]:checked').map(function() {
-    return this.value;
-  }).get().join('|');
-  //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(frees, 6, true, false, false, false);
-  
-  //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="pvalue"]:checked').map(function() {
-    return this.value;
-  }).get().join('|');
-  //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(frees, 7, true, false, false, false);
-  
-  //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="shipno"]:checked').map(function() {
-    return this.value;
-  }).get().join('|');
-  //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(frees, 8, true, false, false, false);
-  
-  //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="eta"]:checked').map(function() {
-    return this.value;
-  }).get().join('|');
-  //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(frees, 10, true, false, false, false);
-  
-  //build a filter string with an or(|) condition
-  var frees = $('input:checkbox[name="status"]:checked').map(function() {
-    return this.value;
-  }).get().join('|');
-  //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
-  otable2.fnFilter(frees, 2, true, false, false, false);
+  // //build a filter string with an or(|) condition
+  // var frees = $('input:checkbox[name="status"]:checked').map(function() {
+    // return this.value;
+  // }).get().join('|');
+  // //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive
+  // otable2.fnFilter(frees, 2, true, false, false, false);
 }