diff --git a/public/Forwarder/shipmentarrange.html b/public/Forwarder/shipmentarrange.html
index b47ff8b..58b6883 100644
--- a/public/Forwarder/shipmentarrange.html
+++ b/public/Forwarder/shipmentarrange.html
@@ -523,8 +523,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     </div>
                                                                 </div>
                                                                 <!--/span-->
-                                                            </div>
-                                                            <div class="row">
+                                                        <div class="row">
                                                                 <div class="col-md-6">
                                                                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h4><b>Loading Venue</b></h4>
                                                                 </div>
@@ -532,7 +531,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <div class="col-md-6">
                                                                 </div>
                                                                 <!--/span-->
-                                                            </div>
+                                                        </div>
                                                             <div class="row">
                                                                 <div class="col-md-6">
                                                                     <div class="form-group">
@@ -625,8 +624,8 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             </div>
                                                         </div>
                                                     </div>
-                                                        <div class="tab-pane" id="tab2">
-                                                            <div class="col-md-13">
+                            <div class="tab-pane" id="tab2">
+                                <div class="col-md-13">
                                     <div class="portlet light bordered">
                                         <div class="portlet-title">
                                             <div class="caption">
@@ -667,8 +666,18 @@ License: You must have a valid license purchased only from themeforest(the above
                                             </table>
                                             <div  class="form-group">
                                                 <label class="control-label col-md-3">Message</label>
-                                                <div class="col-md-6">
-                                                <textarea class="form-control" rows="4"></textarea></div>
+                                                <div class="col-md-7">
+                                                <textarea id="message" class="form-control" rows="10">
+CIEF Delivery Message
+
+Order No: <<order_no>> 
+Delivery Date: 03-07-2017
+Driver Name: Bob 
+Driver Contact No: 013-3456789
+Vehicle No: WAA 123 C
+
+* Kindly proceed to the messenger to confirm
+</textarea>
                                             </div>
                                             </div>
                                             <div class="form-actions">
@@ -754,6 +763,176 @@ License: You must have a valid license purchased only from themeforest(the above
                     </div>
                     <!-- END CONTENT BODY -->
                 </div>
+                 <div class="modal fade" id="boxes" tabindex="-1" role="boxes" aria-hidden="true">
+                    <div class="portlet-body" >
+                       <div class="modal-dialog">
+                        <div class="modal-content">
+                            <div class="modal-body">
+                                <div class="form-body">
+                                    <div class="form-group"> 
+
+                                        <!-- PERSONAL INFO TAB -->
+                                        <div align="center">
+                                        
+                                        </div>
+
+                                        <div class="tab-pane active" id="tab_1_1" class="col-md-12">
+                                    <div class="portlet light bordered">
+                                        <div class="portlet-title">
+                                            <div class="caption">
+                                                <i class="icon-social-dribbble font-green hide"></i>
+                                                <span class="caption-subject font-dark bold uppercase">Shipment arrangement details</span>
+                                            </div>
+                                        </div>
+                                         <div class="tab-pane active" id="tab1">
+                                                            <div class="row" class="col-md-9">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Loading Date : 02-02-2017</p>
+                                                                        
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Container No : CTN121</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Shipping No : 12345</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>ETD : 03-02-2017</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Loading Departure : Guangzhou
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>ETA : 04-02-2017</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Loading Arrival : Port Klang</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                        <div class="row">
+                                                                <div class="col-md-6">
+                                                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h5><b>LOADING VENUE</b></h5>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                </div>
+                                                                <!--/span-->
+                                                        </div>
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Trailer No : JLM 1234</p>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Area : Semenyih</p>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Driver Name : Bob</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Country : Malaysia</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <!--/row-->
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Driver Contact No : 0123456789</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Postcode : 62150</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <!--/row-->
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Contact Person : Kyle</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Contact Person No : 0123456789</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <p>Remark : On the Way to delivered</p>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            </div>
+                                                    </div>
+                                            
+                                        <div class="row">
+                                            <div  class="col-md-offset-4 col-md-9">
+                                                <a href="javascript:;" class="btn btn-outline green button-next"> Edit</a>
+                                                <button type="button" class="btn dark btn-outline" data-dismiss="modal">Close</button>
+                                                </div>
+                                                </div>
+                                        </div>
+                                    </div>
+                                    </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                           </div>
+                        </div>
+                        </div>
+                    </div>
                 <!-- END CONTENT -->
                 <div class="modal fade" id="profile" tabindex="-1" role="profile" aria-hidden="true">
                     <div class="portlet-body" >
@@ -773,7 +952,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         <div class="portlet-title">
                                             <div class="caption">
                                                 <i class="icon-social-dribbble font-green hide"></i>
-                                                <span class="caption-subject font-dark bold uppercase">Consolidation</span>
+                                                <span class="caption-subject font-dark bold uppercase">Customs Examination</span>
                                             </div>
                                         </div>
                                         <div class="portlet-body">
@@ -808,13 +987,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             </tbody>
                                             </table>
                                         </div>
-                                    <div class="portlet light bordered">
-                                        <div class="portlet-title">
-                                            <div class="caption">
-                                                <i class="icon-social-dribbble font-green hide"></i>
-                                                <span class="caption-subject font-dark bold uppercase">Customs Examination</span>
-                                            </div>
-                                        </div>
+                                    
                                         <div class="portlet-body">
                                             <br>
                                             <p>Customs Examination Departure Port</p> 
@@ -900,12 +1073,12 @@ License: You must have a valid license purchased only from themeforest(the above
 		
 			
             var dataSet = [
-				["1","<a  style='float:center' data-toggle='modal' href='#profile'> CTN121 </a>","789ABC","01-08-2017","<span style='color:red'>01-08-2017 </span>","<span style='color:red'>05-08-2017 </span>","12345","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61250, Dongguan","<span style='color:red'>Customs Examination </span><br/><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 href='javascript:;'> Action </a></li><li><a href='javascript:;'> Another action <span class='badge badge-warning'> 2 </span></a></li><li><a href='javascript:;'> Something else here </a></li><li class='divider'> </li><li><a href='javascript:;'> Separated link<span class='badge badge-info'> 7 </span></a></li></ul></div>","Any Remark","<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","<a  style='float:center' data-toggle='modal' href='#profile'> CTN122 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","43657","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61250, Dongguan","Delivered <br/><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 href='javascript:;'> Action </a></li><li><a href='javascript:;'> Another action <span class='badge badge-warning'> 2 </span></a></li><li><a href='javascript:;'> Something else here </a></li><li class='divider'> </li><li><a href='javascript:;'> Separated link<span class='badge badge-info'> 7 </span></a></li></ul></div>","Any Remark","<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"],
-				["3","<a  style='float:center' data-toggle='modal' href='#profile'> CTN123 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","23532","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:86000, Hong Kong","Delivered<br/><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 href='javascript:;'> Action </a></li><li><a href='javascript:;'> Another action <span class='badge badge-warning'> 2 </span></a></li><li><a href='javascript:;'> Something else here </a></li><li class='divider'> </li><li><a href='javascript:;'> Separated link<span class='badge badge-info'> 7 </span></a></li></ul></div>","Any Remark","<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"],
-				["4","<a  style='float:center' data-toggle='modal' href='#profile'> CTN124 </a>","789ABC","01-08-2017","<span style='color:red'>02-08-2017 </span>","<span style='color:red'>04-08-2017 </span>","68679","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61500, Guangzhou","<span style='color:red'>Customs Examination </span><br/><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 href='javascript:;'> Action </a></li><li><a href='javascript:;'> Another action <span class='badge badge-warning'> 2 </span></a></li><li><a href='javascript:;'> Something else here </a></li><li class='divider'> </li><li><a href='javascript:;'> Separated link<span class='badge badge-info'> 7 </span></a></li></ul></div>","Any Remark","<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"],
-				["5","<a  style='float:center' data-toggle='modal' href='#profile'> CTN125 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","43665","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61500, Guangzhou","Delivered<br/><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 href='javascript:;'> Action </a></li><li><a href='javascript:;'> Another action <span class='badge badge-warning'> 2 </span></a></li><li><a href='javascript:;'> Something else here </a></li><li class='divider'> </li><li><a href='javascript:;'> Separated link<span class='badge badge-info'> 7 </span></a></li></ul></div>","Any Remark","<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"],				
-				["6","<a  style='float:center' data-toggle='modal' href='#profile'> CTN130 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","89706","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:86000, Hong Kong","Delivered<br/><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 href='javascript:;'> Action </a></li><li><a href='javascript:;'> Another action <span class='badge badge-warning'> 2 </span></a></li><li><a href='javascript:;'> Something else here </a></li><li class='divider'> </li><li><a href='javascript:;'> Separated link<span class='badge badge-info'> 7 </span></a></li></ul></div>","Any Remark","<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"],
+				["1","CTN121","789ABC","01-08-2017","<span style='color:red'>01-08-2017 </span>","<span style='color:red'>05-08-2017 </span>","12345","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61250, Dongguan","<span style='color:red'>Customs Examination </span><br/><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='javascript:;'> Delete</a></li><li><a  data-toggle='modal' href='#profile'> Customs</a></li></ul></div>","Any Remark","<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","CTN122","789ABC","01-08-2017","01-08-2017","01-08-2017","43657","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61250, Dongguan","Delivered <br/><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='javascript:;'> Delete</a></li><li><a  data-toggle='modal' href='#profile'> Customs</a></li></ul></div>","Any Remark","<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"],
+				["3","CTN123","789ABC","01-08-2017","01-08-2017","01-08-2017","23532","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:86000, Hong Kong","Delivered<br/><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='javascript:;'> Delete</a></li><li><a  data-toggle='modal' href='#profile'> Customs</a></li></ul></div>","Any Remark","<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"],
+				["4","CTN124","789ABC","01-08-2017","<span style='color:red'>02-08-2017 </span>","<span style='color:red'>04-08-2017 </span>","68679","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61500, Guangzhou","<span style='color:red'>Customs Examination </span><br/><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='javascript:;'> Delete</a></li><li><a  data-toggle='modal' href='#profile'> Customs</a></li></ul></div>","Any Remark","<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"],
+				["5","CTN125","789ABC","01-08-2017","01-08-2017","01-08-2017","43665","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:61500, Guangzhou","Delivered<br/><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='javascript:;'> Delete</a></li><li><a  data-toggle='modal' href='#profile'> Customs</a></li></ul></div>","Any Remark","<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"],				
+				["6","CTN130","789ABC","01-08-2017","01-08-2017","01-08-2017","89706","Driver Name:Bob <br>Driver No:0123456789<br>Contact Person:Ying<br>Contact No:0112345678<br>Venue:86000, Hong Kong","Delivered<br/><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='javascript:;'> Delete</a></li><li><a  data-toggle='modal' href='#profile'> Customs</a></li></ul></div>","Any Remark","<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"],
             ];
 			
             var dataSet2 =