diff --git a/public/Forwarder/shipmentarrange.html b/public/Forwarder/shipmentarrange.html
index 816b61e..1ef64aa 100644
--- a/public/Forwarder/shipmentarrange.html
+++ b/public/Forwarder/shipmentarrange.html
@@ -405,7 +405,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         <div class="table-container">
 										
                                             <div id="mask"></div>
-											<span id="switch" class="pull-right" style="margin-left:5px; margin-right:5px;">Status : &nbsp;&nbsp;<input type='checkbox' class='make-switch pull-right asdasd' checked data-size='small' data-on-color='success' data-on-text='ON' data-off-color='default' data-off-text='OFF'></span>
+											<!-- <span id="switch" class="pull-right" style="margin-left:5px; margin-right:5px;">Status : &nbsp;&nbsp;<input type='checkbox' class='make-switch pull-right asdasd' checked data-size='small' data-on-color='success' data-on-text='ON' data-off-color='default' data-off-text='OFF'></span> -->
 											<table id="example" class="table table-striped table-bordered table-hover order-column"></table>
 											
                                         </div>
@@ -449,20 +449,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     <i class="fa fa-check"></i> Shipment<br> Status </span>
                                                             </a>
                                                         </li>
-                                                        <li>
-                                                            <a href="#tab3" data-toggle="tab" class="step active">
-                                                                <span class="number"> 3 </span>
-                                                                <span class="desc">
-                                                                    <i class="fa fa-check"></i> Customs <br>Interuption </span>
-                                                            </a>
-                                                        </li><!-- 
-                                                        <li>
-                                                            <a href="#tab4" data-toggle="tab" class="step">
-                                                                <span class="number"> 4 </span>
-                                                                <span class="desc">
-                                                                    <i class="fa fa-check"></i> Confirm </span>
-                                                            </a>
-                                                        </li> -->
                                                     </ul>
                                                     <!-- <div id="bar" class="progress progress-striped" role="progressbar"> -->
                                                     <div class="progress-bar progress-bar-success"> </div>
@@ -631,97 +617,13 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <div class="form-actions">
                                                             <div class="row">
                                                                 <div class="col-md-offset-3 col-md-9">
-                                                                    <a href="javascript:;" class="btn btn-outline green button-next"> Next
+                                                                    <a href="javascript:;" class="btn btn-outline green button-next"> Submit
                                                                     <i class="fa fa-angle-right"></i></a>
                                                                 </div>
                                                             </div>
                                                             </div>
                                                         </div>
-                                                        <div class="tab-pane" id="tab3">
-                                                            <h3 class="block"><b>Your details</b></h3>
-                                                            <div class="form-group">
-                                                                <div class="form-group">
-                                                                <label class="control-label col-md-3">Loading Date
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                    03-08-2017
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label class="control-label col-md-3">Container No
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                    123456
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label class="control-label col-md-3">Shipment No
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                   123456
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label class="control-label col-md-3">ETA
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                    03-08-2017
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label class="control-label col-md-3">ETD
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                    03-08-2017
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label class="control-label col-md-3">Loading Venue
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                    Port Klang
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label class="control-label col-md-3">Remark
-                                                                </label>
-                                                                <div class="col-md-4">
-                                                                    xxxx
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-13">
-                                    <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">List Shipment</span>
-                                            </div>
-                                        </div>
-                                        <div class="portlet-body">
-                                            <br>
-                                            <h4>Customs Interuption Departure Port</h4> 
-                                            <br>
-                                            <p class="caption-subject font-red">New ETD : <input type="date" name="" ></p>
-                                            <p class="caption-subject font-red">New ETA : <input type="date" name="" ></p>
-                                            <br>
-                                            <h4>Customs Inspection Arrival Port</h4>
-                                            <br>
-                                            <p class="caption-subject font-red">Release Date : <input type="date" name="" ></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                                            <div class="form-actions">
-                                                            <div class="row">
-                                                                <div class="col-md-offset-3 col-md-9">
-                                                                    <a href="javascript:;" class="btn default button-previous">
-                                                                    <i class="fa fa-angle-left"></i> Edit </a>
-                                                                    <a href="javascript:;" class="btn btn-outline green"> Submit
-                                                                    <i class="fa fa-angle-right"></i></a>
-                                                                </div>
-                                                            </div>
-                                                            </div>
-                                                        </div>
-                                                        </div>
+                                                        
                                                     </div>
                                                 </div>
                                             </div>
@@ -784,6 +686,94 @@ License: You must have a valid license purchased only from themeforest(the above
                     <!-- END CONTENT BODY -->
                 </div>
                 <!-- END CONTENT -->
+                <div class="modal fade" id="profile" tabindex="-1" role="profile" 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">
+                                    <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">List Shipment</span>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body">
+                                            <table class="table table-bordered table-hover">
+                                            <thead>
+                                                <tr>
+                                                    <th width="5">No</th>
+                                                    <th width="10">Date</th>
+                                                    <th width="10">Order No</th>
+                                                    <!-- <th width="10">Action</th> -->
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <tr>
+                                                   <td>1</td>
+                                                   <td>03-08-2017</td>
+                                                   <td>014567</td> 
+                                                   <!-- <th><input type="checkbox" class="checkboxes"></th> -->
+                                                </tr>
+                                                <tr>
+                                                   <td>2</td>
+                                                   <td>04-08-2017</td>
+                                                   <td>014567</td> 
+                                                   <!-- <th><input type="checkbox" class="checkboxes"></th> -->
+                                                </tr>
+                                                <tr>
+                                                   <td>3</td>
+                                                   <td>05-08-2017</td>
+                                                   <td>014567</td> 
+                                                  <!--  <th><input type="checkbox" class="checkboxes"></th> -->
+                                                </tr>
+                                            </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 Interuption</span>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body">
+                                            <br>
+                                            <p>Customs Interuption Departure Port</p> 
+                                            <br>
+                                            <p class="caption-subject font-red">New ETD : <input type="date" name="" ></p>
+                                            <p class="caption-subject font-red">New ETA : <input type="date" name="" ></p>
+                                            <br>
+                                            <p>Customs Inspection Arrival Port</p>
+                                            <br>
+                                            <p class="caption-subject font-red">Release Date : <input type="date" name="" ></p>
+                                        <div class="row">
+                                            <div  class="col-md-offset-3 col-md-9">
+                                                <a href="javascript:;" class="btn btn-outline green button-next"> Submit</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>
                 <!-- BEGIN QUICK SIDEBAR -->
                 <a href="javascript:;" class="page-quick-sidebar-toggler">
                     <i class="icon-login"></i>
@@ -1393,12 +1383,12 @@ License: You must have a valid license purchased only from themeforest(the above
 		
 			
             var dataSet = [
-				["1","123456","789ABC","01-08-2017","01-08-2017","01-08-2017","12345","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","123456","789ABC","01-08-2017","01-08-2017","01-08-2017","12345","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"],
-				["3","123456","789ABC","01-08-2017","01-08-2017","01-08-2017","12345","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"],
-				["4","123456","789ABC","01-08-2017","01-08-2017","01-08-2017","12345","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"],
-				["5","123456","789ABC","01-08-2017","01-08-2017","01-08-2017","12345","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"],				
-				["6","123456","789ABC","01-08-2017","01-08-2017","01-08-2017","12345","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"],
+				["1","<a  style='float:center' data-toggle='modal' href='#profile'> CTN121 </a>","789ABC","01-08-2017","<a span style='color:red'>01-08-2017 </a>","<a span style='color:red'>05-08-2017 </a>","12345","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","<a  style='float:center' data-toggle='modal' href='#profile'> CTN122 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","43657","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"],
+				["3","<a  style='float:center' data-toggle='modal' href='#profile'> CTN123 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","23532","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"],
+				["4","<a  style='float:center' data-toggle='modal' href='#profile'> CTN124 </a>","789ABC","01-08-2017","<a span style='color:red'>02-08-2017 </a>","<a span style='color:red'>04-08-2017 </a>","68679","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"],
+				["5","<a  style='float:center' data-toggle='modal' href='#profile'> CTN125 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","43665","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"],				
+				["6","<a  style='float:center' data-toggle='modal' href='#profile'> CTN130 </a>","789ABC","01-08-2017","01-08-2017","01-08-2017","89706","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"],
             ];
 			
             var dataSet2 =