diff --git a/Forwarder/shipmentarrange.html b/Forwarder/shipmentarrange.html
index ba65c25..7c271d2 100644
--- a/Forwarder/shipmentarrange.html
+++ b/Forwarder/shipmentarrange.html
@@ -21,7 +21,7 @@ License: You must have a valid license purchased only from themeforest(the above
 
     <head>
         <meta charset="utf-8" />
-        <title>IZYIM | Delivery Arrangement</title> 
+        <title>IZYIM | Shipment Arrangement</title> 
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta content="width=device-width, initial-scale=1" name="viewport" />
         <meta content="Preview page of Metronic Admin Theme #1 for statistics, charts, recent events and reports" name="description" />
@@ -347,7 +347,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <i class="fa fa-circle"></i>
                                 </li>
                                 <li>
-                                    <a  href="deliveryarrange.html">Delivery Arrangement</a>
+                                    <a  href="deliveryarrange.html">Shipment Arrangement</a>
                                 </li>
                             </ul>
                         </div>
@@ -364,7 +364,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                 <div class="portlet box green">
                                     <div class="portlet-title">
                                         <div class="caption">
-                                            <i class="fa fa-cogs"></i><strong>Delivery Arrangement Status</strong> </div>
+                                            <i class="fa fa-cogs"></i><strong>Shipment Arrangement Status</strong> </div>
                                         <div class="actions">
 											<div class="btn-group" style="display:none">
 												<a id="qweqwe" class="btn white btn-outline btn-circle" href="#form_delivery" data-toggle="modal" > Arrange Delivery
@@ -429,53 +429,49 @@ License: You must have a valid license purchased only from themeforest(the above
 										<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
+                                            <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Shipment 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 id="own_transport" style="display:none">
-										<h5>Driver Details</h5>
+									<div>
+										<h5>Shipment Details</h5>
 										<hr>
 										<div class="form">
 											<div class="row">
 												<div class="col-md-12">
-													<div class="col-md-6">
+													<div class="col-md-4">
 														<div class="form-group">
-															<label>Delivery Date</label>
+															<label>Loading Date</label>
 															<input class="form-control">
 														</div>
 														<div class="form-group">
-															<label>Driver Name</label>
+															<label>Container No</label>
+															<input class="form-control">
+														</div>
+														<div class="form-group">
+															<label>Shipment No</label>
+															<input class="form-control">
+														</div>	
+													</div>
+													<div class="col-md-4">
+														<div class="form-group">
+															<label>ETD</label>
+															<input class="form-control">
+														</div>	
+														<div class="form-group">
+															<label>ETA</label>
 															<input class="form-control">
 														</div>
 													</div>
-													<div class="col-md-6">
+													<div class="col-md-4">																										
 														<div class="form-group">
-															<label>Driver Contact</label>
+															<label>Contact Person</label>
 															<input class="form-control">
 														</div>
+																																								
 														<div class="form-group">
-															<label>Vehicle No</label>
+															<label>Contact Person No</label>
 															<input class="form-control">
 														</div>
 													</div>
@@ -483,70 +479,6 @@ License: You must have a valid license purchased only from themeforest(the above
 											</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>
@@ -554,8 +486,6 @@ License: You must have a valid license purchased only from themeforest(the above
 										 
                                             <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>-->
                                         </div>
 										<br>
 										<div class="form">
@@ -567,19 +497,20 @@ License: You must have a valid license purchased only from themeforest(the above
 														<div class="row">
 															<div class="col-md-10">
 																<textarea id="message" class="form-control" rows="10">
-CIEF Delivery Message
+CIEF Shipment Message
 
 Order No: <<order_no>> 
-Delivery Date: 03-07-2017
-Driver Name: Bob 
-Driver Contact No: 013-3456789
-Vehicle No: WAA 123 C
+ETD: 03-07-2017
+ETA: 05-07-2017 
+Shipment No: 013-3456789
+Contact Person: Ciku
+Contact Person No: 0123456789
 
 * Kindly proceed to the messenger to confirm
 </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>
+																<button type="button" class="btn green" onclick="confirm('Your shipment 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>  
@@ -1209,9 +1140,9 @@ Vehicle No: WAA 123 C
 				["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","Bangi<br>Selangor","123456","03-07-2017","<span style='color:red'><strong>03-07-2017<br/>Delayed</strong></span>","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","Bangi<br>Selangor","123456","02-07-2017","02-07-2017","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","Bangi<br>Selangor","123456","01-07-2017","<span style='color:red'><strong>01-07-2017<br/>Delayed</strong></span>","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","Bangi<br>Selangor","123456","30-06-2017","<span style='color:red'><strong>30-06-2017<br/>Delayed</strong></span>","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='#form_delivery' data-toggle='modal'>Fail to Deliver</a></div>", "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","Bangi<br>Selangor","123456","30-06-2017","<span style='color:red'><strong>30-06-2017<br/>Delayed</strong></span>","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='#form_delivery' data-toggle='modal'>Shipment Failed</a></div>", "Not Completed"],
 				["5","<span style='color:red;'><strong>10-07-2017</strong></span>","Vehicle No:JLK3333<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/0004","CTN56","Bangi<br>Selangor","123456","29-06-2017","29-06-2017","Delivery Request <span style='color:#ed6b75;font-weight: 700;'>Refused</span>", "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","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","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='#form_delivery' 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","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","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='#form_delivery' data-toggle='modal'>Shipment Failed</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","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","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","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"]
             ];
@@ -1275,7 +1206,7 @@ Vehicle No: WAA 123 C
 				"dom": "<'row' <'col-md-12'T>><'row'<'col-md-6'f><'col-md-6'<'toolbar2'B>>r>t<'row'<'col-md-5 col-sm-12'i><'col-md-7 col-sm-12'p>>",
 				buttons: [
 					{
-						text: 'Delivery Arrangement',
+						text: 'Shipment Arrangement',
 						className: 'btn red  btn-circle btn-outline qweqwe',
 						action: function ( e, dt, node, config ) {
 							$("#qweqwe").trigger('click');
