diff --git a/public/Forwarder/chat.html b/public/Forwarder/chat.html
index 7d79480..2108787 100644
--- a/public/Forwarder/chat.html
+++ b/public/Forwarder/chat.html
@@ -466,6 +466,16 @@
                                                                 <div class="tab-content">
                                                                     <div class="tab-pane active" id="tab_1_1_1">
                                                                         <ul class="chats">
+                                                                            <li class="in">
+                                                                                <a style="float:left" data-toggle="modal" href="#profile"> Bob Nilson </a>
+                                                                                <br>
+                                                                                <img class="avatar" alt="" src="../assets/layouts/layout/img/avatar1.jpg" />
+                                                                                <div class="message">
+                                                                                    <span class="arrow"> </span>
+                                                                                    <span class="body"><strong> Decision requested</strong> <a data-toggle="modal" href="#request">View</a> <br/> <a href="#url">Reply</a> <a href="#url">Recall</a> </span>
+                                                                                    <span class="datetime" style="float:right">  20:30 </span>
+                                                                                </div>
+                                                                            </li>
                                                                             <li class="out">
                                                                                 <a style="float:right" data-toggle="modal" href="#profile">Lisa Wong </a>
                                                                                 <br>
@@ -685,65 +695,7 @@
                                                 </div>
                                             </div>
                                             <!--
-										<div class="portlet-body">
-											<div class="scroller" style="height: 300px;" data-always-visible="1" data-rail-visible="0">
-												<ul class="feeds">
-													<li>
-														<div class="col1">
-															<div class="cont">
-																<div class="cont-col1">
-																	<div class="label label-sm label-info">
-																		<i class="fa fa-money"></i>
-																	</div>
-																</div>
-																<div class="cont-col2">
-																	<div class="desc"> CIEF updated their currency on <strong>05/08/2017 13:12</strong> for <strong>MYR</strong> currency. The new rate are <strong>Buy 1.6</strong> and <strong>Sell 1.605</strong>.</div>
-																</div>
-															</div>
-														</div>
-														<div class="col2">
-															<div class="date"> Just now </div>
-														</div>
-													</li>
-													<li>
-														<a href="javascript:;">
-															<div class="col1">
-																<div class="cont">
-																	<div class="cont-col1">
-																		<div class="label label-sm label-success">
-																			<i class="fa fa-money"></i>
-																		</div>
-																	</div>
-																	<div class="cont-col2">
-																		<div class="desc"> ABC updated their currency on <strong>05/08/2017 12:52</strong> for <strong>USD</strong> currency. The new rate are <strong>Buy 1.59</strong> and <strong>Sell 1.60</strong>.</div>
-																	</div>
-																</div>
-															</div>
-															<div class="col2">
-																<div class="date"> 20 mins </div>
-															</div>
-														</a>
-													</li>
-													<li>
-														<div class="col1">
-															<div class="cont">
-																<div class="cont-col1">
-																	<div class="label label-sm label-danger">
-																		<i class="fa fa-money"></i>
-																	</div>
-																</div>
-																<div class="cont-col2">
-																	<div class="desc"> ABC updated their currency on <strong>05/08/2017 13:48</strong> for <strong>HKD</strong> currency. The new rate are <strong>Buy 1.59</strong> and <strong>Sell 1.60</strong>.</div>
-																</div>
-															</div>
-														</div>
-														<div class="col2">
-															<div class="date"> 24 mins </div>
-														</div>
-													</li>
-												</ul>
-											</div>
-										</div>
+										
 -->
                                         </div>
                                     </div>
@@ -1013,6 +965,95 @@
                     </div>
                 </div>
                 <!-- Modal -->
+                <div class="modal fade in " id="request" tabindex="-1" role="basic" aria-hidden="true" style="z-index:999999;">
+                    <div class="modal-dialog modal-lg ">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+                                <div class="caption">
+                                    <h3><i class='fa fa-question'></i>Decision Request</h3>
+                                </div>
+                            </div>
+                            <div class="modal-body">
+                                <div class="portlet light bordered">
+                                    <form role="form" action="#">
+                                        <div class="form-group">
+                                            <br/>
+                                            <h2><strong>Unmatch Measurement</strong></h2>
+                                            <div class="portlet-body">
+                                                <table class="table table-bordered table-hover">
+                                                <thead>
+                                                    <tr >
+                                                        <th width="5">No</th>
+                                                        <th width="10">Total Ctn (nominal)</th>
+                                                        <th width="10">Measurement (nominal)</th>
+                                                        <th width="10">Weight (nominal)</th>
+                                                        <th width="5">Total Ctn (actual)</th>
+                                                        <th width="10">Measurement (actual)</th>
+                                                        <th width="10">Weight (actual)</th>
+                                                        <th width="10">Photo Reference</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    <tr class="eror" >
+                                                            <td>1</td>
+                                                            <td>4</td>
+                                                            <td>40x40x40</td>
+                                                            <td>10kg</td>
+                                                            <td ><a href="javascript:void(0)" id="totalctn" data-type="text" data-pk="1" data-original-title="Total Ctn"> 3 </a></td>
+                                                            <td><a href="javascript:void(0)" id="measurement" data-type="text" data-pk="1" data-original-title="Measurement"> 30 x 30 x 30 </a></td>
+                                                            <td><a href="javascript:void(0)" id="weight" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
+                                                            <td>
+                                                                <div>
+                                                                    <span><img class="img-responsive" src="../assets/pages/media/works/img7.jpg" alt="" style="width: 50%; height: 50%"></span>
+
+                                                                </div>    
+                                                            </td>
+                                                        </tr>
+                                                    <tr>
+                                                            <td>2</td>
+                                                            <td>4</td>
+                                                            <td>40x40x40</td>
+                                                            <td>10kg</td>
+                                                            <td><a href="javascript:void(0)" id="totalctn2" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                            <td><a href="javascript:void(0)" id="measurement2" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                            <td><a href="javascript:void(0)" id="weight2" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
+                                                            <td>
+                                                                <div>
+                                                                  <span><img class="img-responsive" src="../assets/pages/media/works/img8.jpg" alt="" style="width: 50%; height: 50%"></span>  
+
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>3</td>
+                                                            <td>4</td>
+                                                            <td>40x40x40</td>
+                                                            <td>10kg</td>
+                                                            <td><a href="javascript:void(0)" id="totalctn3" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                            <td><a href="javascript:void(0)" id="measurement3" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                            <td><a href="javascript:void(0)" id="weight3" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
+                                                            <td>
+                                                                <div>
+                                                                    <span><img class="img-responsive" src="../assets/pages/media/works/img9.jpg" alt="" style="width: 50%; height: 50%"></span>   
+                                                                </div> 
+                                                            </td>
+                                                        </tr>
+                                                </tbody>
+                                                </table>
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn green" onclick="confirm('Thank you. Will proceed with your order.')" data-dismiss="modal" >Yes</button>
+                                                    <button type="button" class="btn dark btn-outline" data-dismiss="modal">No</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="modal fade in " id="decision" tabindex="-1" role="basic" aria-hidden="true" style="z-index:999999;">
                     <div class="modal-dialog ">
                         <div class="modal-content">
@@ -1275,7 +1316,7 @@
                                                         <td>
                                                             <label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'>
                                                                 <input type='checkbox' class='checkboxes' value='1' /><span></span>
-                                                                </label</td>
+                                                            </label></td>
                                                                 <td>4</td>
                                                                 <td>2017-08-02 13:45:22</td>
                                                                 <td><a href="https://unsplash.it/1200/768.jpg?image=251" data-toggle="lightbox" data-gallery="example-gallery" class="col-sm-4">Container</a>
diff --git a/public/Forwarder/deliveryarrange.html b/public/Forwarder/deliveryarrange.html
index 2aa5885..0e0d70e 100644
--- a/public/Forwarder/deliveryarrange.html
+++ b/public/Forwarder/deliveryarrange.html
@@ -429,8 +429,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>
+                                            
                                             <table id="example" class="table table-striped table-bordered table-hover order-column"></table>
 
                                         </div>
diff --git a/public/Forwarder/index.html b/public/Forwarder/index.html
index 84763f1..ad48e65 100644
--- a/public/Forwarder/index.html
+++ b/public/Forwarder/index.html
@@ -435,7 +435,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             </ul>
                                                         </th>
                                                         <th width="1%"> Supplier
-                                                            <br/> Code
+                                                            <br/> Name
                                                             <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>
@@ -563,7 +563,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <br/>
                                                             </center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0008 </td>
                                                         <td>
                                                             <center>12,000.00 (RMB)</center>
@@ -601,7 +601,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <br/>
                                                             </center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0007 </td>
                                                         <td>
                                                             <center>15,000.00 (USD)</center>
@@ -639,7 +639,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <br/>
                                                             </center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0005 </td>
                                                         <td>
                                                             <center>8,000.00 (MYR)</center>
@@ -677,7 +677,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <br/>
                                                             </center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0004 </td>
                                                         <td>
                                                             <center>5,000.00 (HKD)</center>
@@ -716,7 +716,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <br/>
                                                             </center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0003 </td>
                                                         <td>
                                                             <center>4,000.00 (USD)</center>
diff --git a/public/Forwarder/profile.html b/public/Forwarder/profile.html
index f16d1ad..a218854 100644
--- a/public/Forwarder/profile.html
+++ b/public/Forwarder/profile.html
@@ -319,7 +319,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <ul class="nav">
                                                 <li class="active">
                                                     <a href="profile.html">
-                                                        <i class="icon-settings"></i> Profile Settings </a>
+                                                        <i class="icon-settings"></i> Personal Settings </a>
                                                 </li>
                                                 <li>
                                                     <a href="team.html">
@@ -372,9 +372,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                             <div class="col-md-10" style="padding-left: 0px;padding-right: 0px;">
                                                                                 <input type="text" placeholder="+6 012 3456789" class="form-control" />
                                                                             </div>
-                                                                            <div class="col-md-2" style="padding-left: 30px;">
-                                                                                <input type="checkbox" checked class="make-switch" data-size="small">
-                                                                            </div>
+                                                                            
                                                                         </div>
                                                                     </div>
                                                                 </div>
diff --git a/public/Forwarder/shippingorderstatus.html b/public/Forwarder/shippingorderstatus.html
index 991e448..e14e147 100644
--- a/public/Forwarder/shippingorderstatus.html
+++ b/public/Forwarder/shippingorderstatus.html
@@ -313,7 +313,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <i class="fa fa-circle"></i>
                                 </li>
                                 <li>
-                                    <a href="purchaseorder2.html">Purchase Order</a>
+                                    <a href="shippingorderstatus.html">Shipping Order</a>
                                 </li>
                             </ul>
                         </div>
@@ -405,6 +405,12 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <span class="fa fa-filter"></span>
                                                             </button>
                                                         </th>
+                                                        <th width="1%"> PO Status
+                                                            <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>
+                                                        </th>
                                                         <th width="1%"> Total CBM
                                                             <br/>
                                                             <button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -443,6 +449,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> Infinite co.</td>
                                                         <td> Bob Supply Warehouse
                                                             <br>Venue:61250, Hong Kong</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 451cm</td>
                                                         <td> 123kg</td>
                                                         <td> 14</td>
@@ -474,6 +481,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> Inspirit co.</td>
                                                         <td> Bob Supply Warehouse
                                                             <br>Venue:61250, Hong Kong</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 321cm</td>
                                                         <td> 123kg</td>
                                                         <td> 17</td>
@@ -505,6 +513,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> Indynamic co.</td>
                                                         <td> Bob Supply Warehouse
                                                             <br>Venue:61250, Hong Kong</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 321cm</td>
                                                         <td> 123kg</td>
                                                         <td> 11</td>
@@ -535,6 +544,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> Indinite co.</td>
                                                         <td> Tom Warehouse
                                                             <br>Venue:61250, Dongguan</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 321cm </td>
                                                         <td> 245kg </td>
                                                         <td> 19</td>
diff --git a/public/Forwarder/team.html b/public/Forwarder/team.html
index 4149789..7f325e2 100644
--- a/public/Forwarder/team.html
+++ b/public/Forwarder/team.html
@@ -759,13 +759,13 @@ License: You must have a valid license purchased only from themeforest(the above
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="control-label col-md-4">Position</label>
+								<label class="control-label col-md-4">Access Right</label>
 								<div class="col-md-8">
 									<div class="input-group select2-bootstrap-prepend">
-										<select id="position" name="position" class="form-control select2-allow-clear">
+										<select id="accessright" name="accessright" class="form-control select2-allow-clear">
 											<option></option>
 											<option value="1">Admin</option>
-											<option value="2">Staff</option>
+											<option value="2">User</option>
 										</select>
 									</div>
 								</div>
diff --git a/public/Forwarder/updatecurrency.html b/public/Forwarder/updatecurrency.html
index d71b653..6d61bc6 100644
--- a/public/Forwarder/updatecurrency.html
+++ b/public/Forwarder/updatecurrency.html
@@ -339,29 +339,24 @@ License: You must have a valid license purchased only from themeforest(the above
                                                     <table id="user" class="table table-bordered table-striped">
                                                         <thead>
                                                             <th>Date & Time</th>
-                                                            <th>Rate(Buy)</th>
                                                             <th>Rate(Sell)</th>
                                                         </thead>
                                                         <tbody>
                                                             <tr>
                                                                 <td>04/07/2017 13:12</td>
-                                                                <td>1.6 </td>
                                                                 <td>1.605 </td>
                                                             </tr>
                                                             <tr>
                                                                 <td>03/07/2017 13:20</td>
-                                                                <td>1.59 </td>
                                                                 <td>1.6 </td>
                                                             </tr>
                                                             <tr>
                                                                 <td>02/07/2017 13:09</td>
-                                                                <td>1.59 </td>
                                                                 <td>1.6 </td>
                                                             </tr>
                                                             <tr>
                                                                 <td> </td>
                                                                 <td> </td>
-                                                                <td> </td>
                                                             </tr>
                                                         </tbody>
                                                     </table>
diff --git a/public/Importer/index.html b/public/Importer/index.html
index dbd6f46..332844f 100644
--- a/public/Importer/index.html
+++ b/public/Importer/index.html
@@ -371,7 +371,7 @@ License: You must have a valid license purchased only from themeforest(the above
 															  <li><input onchange="filterme()" name="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul> 
 														</th>-->
-														<th width="1%"> Supplier<br/> Code <br/>
+														<th width="1%"> Supplier<br/> Name <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">
@@ -448,7 +448,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00005<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 5 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-														<td> 123456 </td>
+														<td> HMM </td>
                                                         <td> CIEF/0008 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>12,000.00 (RMB)</center> </td>
@@ -468,7 +468,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00004<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 10 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0007 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>15,000.00 (USD)</center> </td>
@@ -488,7 +488,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00003<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat </a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0005 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>8,000.00 (MYR)</center> </td>
@@ -508,7 +508,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00002<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 1 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0004 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>5,000.00 (HKD)</center> </td>
@@ -527,7 +527,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00001<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat </a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center> </td>										
-                                                        <td> 123456 </td>
+                                                        <td> HMM </td>
                                                         <td> CIEF/0003 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>4,000.00 (USD)</center> </td>
diff --git a/public/Importer/profile.html b/public/Importer/profile.html
index 4ebd6cd..c2b1452 100644
--- a/public/Importer/profile.html
+++ b/public/Importer/profile.html
@@ -269,7 +269,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <ul class="nav">
                                                 <li class="active">
                                                     <a href="profile.html">
-                                                        <i class="icon-settings"></i> Profile Settings </a>
+                                                        <i class="icon-settings"></i> Personal Settings </a>
                                                 </li>
                                                 <li>
                                                     <a href="team.html">
@@ -322,9 +322,7 @@ License: You must have a valid license purchased only from themeforest(the above
 																		<div class="col-md-9" style="padding-left: 0px;padding-right: 0px;">
 																			<input type="text" placeholder="+6 012 3456789" class="form-control" />
 																		</div>
-																		<div class="col-md-3" style="padding-left: 30px;">
-																			<input type="checkbox" checked class="make-switch" data-size="small" data-on-text="HIDE" data-off-text="UNHIDE" >
-																		</div>
+																		
 																	</div>
 																	</div>
 																</div>
diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html
index 3143963..9f372ac 100644
--- a/public/Importer/shippingorder.html
+++ b/public/Importer/shippingorder.html
@@ -357,6 +357,12 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     <input type="text" class="form-control" id="marking" placeholder="IFNT">
                                                                                 </div>
                                                                             </div>
+                                                                            <div class="form-group">
+                                                                                <label for="so" class="col-md-2 control-label">Warehouse Order No</label>
+                                                                                <div class="col-md-4">
+                                                                                    <input type="text" class="form-control" id="whorderno" placeholder="IFNT1004">
+                                                                                </div>
+                                                                            </div>
                                                                         </div>
 
                                                                         <div id="issue2" style="display: none;">
@@ -405,6 +411,12 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     <input type="textarea" class="form-control" id="marking" placeholder="IFNT">
                                                                                 </div>
                                                                             </div>
+                                                                            <div class="form-group">
+                                                                                <label for="so" class="col-md-2 control-label">Warehouse Order No</label>
+                                                                                <div class="col-md-4">
+                                                                                    <input type="text" class="form-control" id="whorderno" placeholder="IFNT1004">
+                                                                                </div>
+                                                                            </div>
                                                                         </div>
                                                                     </div>
                                                                 </div>
@@ -592,7 +604,7 @@ License: You must have a valid license purchased only from themeforest(the above
 														<a href="javascript:;" class="btn btn-outline green button-next"> Next
 															<i class="fa fa-angle-right"></i>
 														</a>
-														<a onclick="confirm('Please print out this marking label and paste to every carton.')" data-toggle="modal" href="#marking2" class="btn green button-submit" >Finish
+														<a  data-toggle="modal" href="#marking2" class="btn green button-submit" >Finish
 															<i class="fa fa-check"></i>
 														</a>
 													</div>
@@ -662,7 +674,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         </div>
                                                         <div class="col-md-8">
                                                             <div class="form-body" >
-                                                                <h1 align="center"><strong>CIEF/011257</strong></h1>
+                                                                <h1 align="center"><strong>CIEF/011257<br/>IFNT1004</strong></h1>
                                                                     <div class="form-group">
                                                                         <label class="control-label col-md-5">Warehouse Address 
                                                                         </label>
@@ -694,7 +706,9 @@ License: You must have a valid license purchased only from themeforest(the above
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                    <div class="modal-footer"  >
+                                        <h5 style="color:red" align="center"><Strong >Please print out this marking label and paste to every carton.</Strong></h5>
+                                    </div>
                             </div>
                         </div>
                 
diff --git a/public/Importer/shippingorderstatus.html b/public/Importer/shippingorderstatus.html
index 0cd6acc..3e5ae8b 100644
--- a/public/Importer/shippingorderstatus.html
+++ b/public/Importer/shippingorderstatus.html
@@ -341,6 +341,10 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <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>
                                                         </th>
+                                                        <th width="1%"> PO Status <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>
+                                                        </th>
                                                         <th width="1%"> Total CBM <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>
@@ -368,12 +372,15 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> CIEF/001254</td>
                                                         <td> Infinite co.</td>
                                                         <td> Bob Supply Warehouse <br>Venue:61250, Hong Kong</td>
+                                                        <td><a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 451cm</td>
                                                         <td> 123kg</td>
                                                         <td> 14</td>
 														<td><center>
                                                             <div class='btn-group'>
-                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a data-toggle="modal" href ='#preview'>Preview PL</a></li>
+                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'>
+                                                                <li><a data-toggle="modal" href ='#preview'>Preview PL</a></li>
+                                                                <li><a data-toggle="modal" href ='#edit'>Edit</a></li>
                                                                 <li><a data-toggle="modal" href ='#marking'>Print Marking</a></li>
                                                                 <li><a href='shippingorder.html'> Cancel </a></li></ul>
                                                             </div><br/></center>
@@ -386,12 +393,15 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> ABC/001254</td>
                                                         <td> Inspirit co.</td>
                                                         <td> Bob Supply Warehouse <br>Venue:61250, Hong Kong</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 321cm</td>
                                                         <td> 123kg</td>
                                                         <td> 17</td>
                                                         <td><center>
                                                             <div class='btn-group'>
-                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a data-toggle="modal" href ='#preview'>Preview</a></li>
+                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'>
+                                                                <li><a data-toggle="modal" href ='#preview'>Preview</a></li>
+                                                                <li><a data-toggle="modal" href ='#edit'>Edit</a></li>
                                                                 <li><a data-toggle="modal" href ='#marking'>Print Marking</a></li>
                                                                 <li><a href='shippingorder.html'> Cancel </a></li></ul>
                                                             </div><br/></center>
@@ -404,12 +414,15 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> CIEF/001254</td>
                                                         <td> Indynamic co.</td>
                                                         <td> Bob Supply Warehouse <br>Venue:61250, Hong Kong</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 321cm</td>
                                                         <td> 123kg</td>
                                                         <td> 11</td>
                                                         <td><center>
                                                             <div class='btn-group'>
-                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a data-toggle="modal" href ='#preview'>Preview</a></li>
+                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'>
+                                                                <li><a data-toggle="modal" href ='#preview'>Preview</a></li>
+                                                                <li><a data-toggle="modal" href ='#edit'>Edit</a></li>
                                                                 <li><a data-toggle="modal" href ='#marking'>Print Marking</a></li>
                                                                 <li><a href='shippingorder.html'> Cancel </a></li>></ul>
                                                             </div><br/></center>
@@ -422,12 +435,15 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td> CIEF/001254</td>
                                                         <td> Indinite co.</td>
                                                         <td> Tom Warehouse <br>Venue:61250, Dongguan</td>
+                                                        <td> <a href="purchaseorder.html"> Yes </a></td>
                                                         <td> 321cm </td>
                                                         <td> 245kg </td>
                                                         <td> 19</td>
                                                         <td><center>
                                                             <div class='btn-group'>
-                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a data-toggle="modal" href ='#preview'>Preview</a></li>
+                                                            <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'>
+                                                                <li><a data-toggle="modal" href ='#preview'>Preview</a></li>
+                                                                <li><a data-toggle="modal" href ='#edit'>Edit</a></li>
                                                                 <li><a data-toggle="modal" href ='#marking'>Print Marking</a></li>
                                                                 <li><a href='shippingorder.html'> Cancel </a></li></ul>
                                                             </div><br/></center>
@@ -463,6 +479,153 @@ License: You must have a valid license purchased only from themeforest(the above
             </div>
             <!-- END FOOTER -->
         </div>
+                <div class="modal fade" id="edit" tabindex="-1" role="edit" aria-hidden="true">
+                    <div class="modal-dialog modal-lg">
+                        <div class="modal-content">
+                            <div class="modal-body"> 	
+                                <div class="row">
+                                    <div class="portlet box green">
+                                        <div class="portlet-title">
+                                            <div class="caption">
+                                                <i class="fa fa-cogs"></i><strong>Packing List</strong> </div>
+                                            <div class="actions">
+                                                <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">
+                                                                <i class="icon-printer"></i> Print</a>
+                                                        </li>
+                                                        <li>
+                                                            <a href="javascript:;" data-action="1" class="tool-action">
+                                                                <i class="icon-check"></i> Copy</a>
+                                                        </li>
+                                                        <li>
+                                                            <a href="javascript:;" data-action="2" class="tool-action">
+                                                                <i class="icon-doc"></i> PDF</a>
+                                                        </li>
+                                                        <li>
+                                                            <a href="javascript:;" data-action="3" class="tool-action">
+                                                                <i class="icon-paper-clip"></i> Excel</a>
+                                                        </li>
+                                                        <li>
+                                                            <a href="javascript:;" data-action="4" class="tool-action">
+                                                                <i class="icon-cloud-upload"></i> CSV</a>
+                                                        </li>
+                                                        <li class="divider"> </li>
+                                                        <li>
+                                                            <a href="javascript:;" data-action="5" class="tool-action">
+                                                                <i class="icon-refresh"></i> Reload</a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body">
+                                            <div class="table-container">
+                                                <table id="table1" class="table table-bordered table-striped">
+                                                    <thead>
+                                                        <tr>
+                                                            <th rowspan="2">No </th>
+                                                            <th rowspan="2">Product Name</th>
+                                                            <th rowspan="2">Model</th>
+                                                            <th rowspan="2">UOM</th>
+                                                            <th rowspan="2">Qty</th>
+                                                            <th colspan="3">CMB</th>
+                                                            <th colspan="2">Weight</th>
+                                                            <th rowspan="2">Photo</th>
+                                                            <th rowspan="2">Remark</th>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>Height</td>
+                                                            <td>Weight</td>
+                                                            <td>Depth</td>
+                                                            <td>Cross</td>
+                                                            <td>Nett</td>
+                                                        </tr>
+
+                                                    </thead>
+                                                    <tbody>
+
+                                                        <tr>
+                                                            <td contenteditable="true">1 </td>
+                                                            <td contenteditable="true">Television </td>
+                                                            <td contenteditable="true">CS110 </td>
+                                                            <td contenteditable="true">Unit </td>
+                                                            <td contenteditable="true">10 </td>
+                                                            <td contenteditable="true">12 </td>
+                                                            <td contenteditable="true">15</td>
+                                                            <td contenteditable="true">12</td> 
+                                                            <td contenteditable="true">12</td>
+                                                            <td contenteditable="true">15</td>    
+                                                            <td contenteditable="true"><img src="../assets/global/img/tv.jpg" alt="" style="width:100px;height:75px;" /></td>
+                                                            <td contenteditable="true"> </td>
+
+
+                                                        </tr>
+                                                        <tr>
+                                                            <td contenteditable="true">2 </td>
+                                                            <td contenteditable="true">Tire </td>
+                                                            <td contenteditable="true">CS251 </td>
+                                                            <td contenteditable="true">Unit </td>
+                                                            <td contenteditable="true">20 </td>
+                                                            <td contenteditable="true">12 </td>
+                                                            <td contenteditable="true">15</td>
+                                                            <td contenteditable="true">12</td> 
+                                                            <td contenteditable="true">12</td>
+                                                            <td contenteditable="true">15</td> 
+                                                            <td contenteditable="true"><img src="../assets/global/img/tire.jpg" alt="" style="width:100px;height:100px;" /> </td>
+                                                            <td contenteditable="true"> </td>
+
+                                                        </tr>
+                                                        <tr>
+                                                            <td contenteditable="true">3 </td>
+                                                            <td contenteditable="true">Chair </td>
+                                                            <td contenteditable="true">CS486 </td>
+                                                            <td contenteditable="true">Unit </td>
+                                                            <td contenteditable="true">5 </td>
+                                                            <td contenteditable="true">12 </td>
+                                                            <td contenteditable="true">15</td>
+                                                            <td contenteditable="true">12</td> 
+                                                            <td contenteditable="true">12</td>
+                                                            <td contenteditable="true">15</td> 
+                                                            <td contenteditable="true"><img src="../assets/global/img/chair.jpg" alt="" style="width:100px;height:100px;" />  </td>
+                                                            <td contenteditable="true"> </td>
+
+                                                        </tr>
+                                                        <tr>
+                                                            <td contenteditable="true">4 </td>
+                                                            <td contenteditable="true">Table </td>
+                                                            <td contenteditable="true">CS125 </td>
+                                                            <td contenteditable="true">Unit </td>
+                                                            <td contenteditable="true">5 </td>
+                                                            <td contenteditable="true">12 </td>
+                                                            <td contenteditable="true">15</td>
+                                                            <td contenteditable="true">12</td> 
+                                                            <td contenteditable="true">12</td>
+                                                            <td contenteditable="true">15</td> 
+                                                            <td contenteditable="true"><img src="../assets/global/img/table.jpg" alt="" style="width:100px;height:100px;" /> </td>
+                                                            <td editacontenteditable="true"ble> </td>
+
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                        </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
+                                    <button type="button" class="btn green" onclick="confirm('Your changes have been saved.')" data-dismiss="modal">Save</button>
+                                </div>
+                            </div>
+                        </div>
+                     </div>
                 
                  <div class="modal fade" id="preview" tabindex="-1" role="preview" aria-hidden="true">
                     <div class="modal-dialog modal-lg">
@@ -648,7 +811,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         </div>
                                                         <div class="col-md-8">
                                                             <div class="form-body" >
-                                                                <h1 align="center"><strong>CIEF/011257</strong></h1>
+                                                                <h1 align="center"><strong>CIEF/011257<br/>IFNT1004</strong></h1>
                                                                     <div class="form-group">
                                                                         <label class="control-label col-md-5">Warehouse Address 
                                                                         </label>
diff --git a/public/Importer/team.html b/public/Importer/team.html
index 9bd4734..a84167c 100644
--- a/public/Importer/team.html
+++ b/public/Importer/team.html
@@ -1410,13 +1410,13 @@ License: You must have a valid license purchased only from themeforest(the above
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="control-label col-md-4">Position</label>
+								<label class="control-label col-md-4">Access Right</label>
 								<div class="col-md-8">
 									<div class="input-group select2-bootstrap-prepend">
-										<select id="position" name="position" class="form-control select2-allow-clear">
+										<select id="accessright" name="accessright" class="form-control select2-allow-clear">
 											<option></option>
 											<option value="1">Admin</option>
-											<option value="2">Staff</option>
+											<option value="2">User</option>
 										</select>
 									</div>
 								</div>