diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html
index 3cc8409..556fdff 100644
--- a/public/Importer/shippingorder.html
+++ b/public/Importer/shippingorder.html
@@ -430,7 +430,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 <div class="table-toolbar" align="right">
                                                                     <div class="row">
                                                                         <div class="btn-group">
-																			<a onclick="confirm('This order saved as Draft. This is the link you requested https://gitlab.com/ciefworldwide/IZYIM.git')" class="btn green color-demo tooltips" style="margin-bottom:0px;" data-original-title="Click to view the link" >Form Link</a> 
+																			<a onclick="confirm('This order saved as Draft. This is the link you requested https://gitlab.com/ciefworldwide/IZYIM.git')" class="btn green color-demo tooltips" style="margin-bottom:0px;" data-original-title="Sent the link page for supplier fill in the packing list" >Form Link</a> 
                                                                         </div>
                                                                         <div class="btn-group"> 
                                                                             
@@ -457,12 +457,12 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     </thead>
                                                                     <tbody>
                                                                         <tr>
-                                                                            <td>1 </td>
-                                                                            <td>Television </td>
-                                                                            <td>CS110 </td>
-                                                                            <td>Unit </td>
-                                                                            <td>10 </td>
-                                                                            <td>
+                                                                            <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">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>142m3<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -473,7 +473,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td>
+                                                                            <td contenteditable="true">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -483,18 +483,18 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td><img src="../assets/global/img/tv.jpg" alt="" style="width:100px;height:75px;" />
+                                                                            <td><img src="../assets/global/img/tv.jpg" data-toggle="modal" href="#tv" alt="" style="width:100px;height:75px;" />
                                                                             </td>
-                                                                            <td> </td>
+                                                                            <td contenteditable="true"> </td>
 
                                                                         </tr>
                                                                         <tr>
-                                                                            <td>2 </td>
-                                                                            <td>Tire </td>
-                                                                            <td>CS251 </td>
-                                                                            <td>Unit </td>
-                                                                            <td>20 </td>
-                                                                            <td>
+                                                                            <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">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>452m3<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -505,7 +505,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td>
+                                                                            <td contenteditable="true">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -515,17 +515,17 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td><img src="../assets/global/img/tire.jpg" alt="" style="width:100px;height:100px;" /> </td>
-                                                                            <td> </td>
+                                                                            <td ><img src="../assets/global/img/tire.jpg" data-toggle="modal" href="#tire" alt="" style="width:100px;height:100px;" /> </td>
+                                                                            <td contenteditable="true"> </td>
 
                                                                         </tr>
                                                                         <tr>
-                                                                            <td>3 </td>
-                                                                            <td>Chair </td>
-                                                                            <td>CS486 </td>
-                                                                            <td>Unit </td>
-                                                                            <td>5 </td>
-                                                                            <td>
+                                                                            <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">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>145m3<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -536,7 +536,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td>
+                                                                            <td contenteditable="true">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -546,17 +546,17 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td><img src="../assets/global/img/chair.jpg" alt="" style="width:100px;height:100px;" /> </td>
+                                                                            <td><img src="../assets/global/img/chair.jpg" data-toggle="modal" href="#chair" alt="" style="width:100px;height:100px;"/> </td>
                                                                             <td> </td>
 
                                                                         </tr>
                                                                         <tr>
-                                                                            <td>4 </td>
-                                                                            <td>Table </td>
-                                                                            <td>CS125 </td>
-                                                                            <td>Unit </td>
-                                                                            <td>5 </td>
-                                                                            <td>
+                                                                            <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">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>154m3<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -567,7 +567,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td>
+                                                                            <td contenteditable="true">
                                                                                 <div class='btn-group'>
                                                                                     <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
                                                                                     </button>
@@ -577,8 +577,8 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                     </ul>
                                                                                 </div>
                                                                             </td>
-                                                                            <td><img src="../assets/global/img/table.jpg" alt="" style="width:100px;height:100px;" /> </td>
-                                                                            <td> </td>
+                                                                            <td ><img src="../assets/global/img/table.jpg" data-toggle="modal" href="#tbl" alt="" style="width:100px;height:100px;" /> </td>
+                                                                            <td contenteditable="true"> </td>
 
                                                                         </tr>
                                                                     </tbody>
@@ -601,7 +601,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 href="chat.html" class="btn green button-submit"> Finish
+														<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
 															<i class="fa fa-check"></i>
 														</a>
 													</div>
@@ -617,6 +617,96 @@ License: You must have a valid license purchased only from themeforest(the above
 
                     </div>
                 </div>
+                
+                <div class="modal fade" id="tv" tabindex="-1" role="tv" aria-hidden="true" align="center">
+                    <img src="../assets/global/img/tv.jpg" style="width:65%;height:65%;" />
+                </div>
+                <div class="modal fade" id="tire" tabindex="-1" role="tire" aria-hidden="true" align="center">
+                    <img src="../assets/global/img/tire.jpg" style="width:65%;height:65%;"/>
+                </div>
+                <div class="modal fade" id="chair" tabindex="-1" role="chair" aria-hidden="true" align="center">
+                    <img src="../assets/global/img/chair.jpg" style="width:65%;height:65%;" />
+                </div>
+                <div class="modal fade" id="tbl" tabindex="-1" role="tbl" aria-hidden="true" align="center">
+                    <td ><img src="../assets/global/img/table.jpg" style="width:65%;height:65%;"/> </td>
+                </div>
+                
+                <div class="modal fade" id="marking2" tabindex="-1" role="marking2" 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>Marking</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="2" class="tool-action">
+                                                                <i class="icon-doc"></i> PDF</a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                            
+                                        </div>
+                                            <div class="portlet-body">
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="col-md-4">
+                                                            <div class="form-body">
+                                                                <img src="../assets/global/img/qrcode.jpg" style="height:100% ; width:100%"/>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-8">
+                                                            <div class="form-body" >
+                                                                <h1 align="center"><strong>CIEF/011257</strong></h1>
+                                                                    <div class="form-group">
+                                                                        <label class="control-label col-md-5">Warehouse Address 
+                                                                        </label>
+                                                                        <label class="control-label col-md-6">70 McCullough Dr, New Castle, 19720 Delaware, United State of America
+                                                                        </label>
+                                                                    </div>
+                                                                    <br/>
+                                                                    <br/>
+                                                                    <div class="form-group">
+                                                                        <label class="control-label col-md-5">Contact Person 
+                                                                        </label>
+                                                                        <label class="control-label col-md-6">Lisa Wong
+                                                                        </label>
+                                                                    </div>
+                                                                    <br/>
+                                                                    <div class="form-group">
+                                                                        <label class="control-label col-md-5">Contact No 
+                                                                        </label>
+                                                                        <label class="control-label col-md-6">0112563786
+                                                                        </label>
+                                                                    </div>
+                                                                <br/>
+                                                                    
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                
                 <div class="modal fade" id="addnew" tabindex="-1" role="addnew" aria-hidden="true">
                     <div class="modal-dialog modal-lg">
                         <div class="modal-content">
@@ -755,7 +845,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                 </div>
                                                                             </div>
                                                                             <div class="form-group">
-                                                                                <label class="col-md-3 control-label">Packaging</label>
+                                                                                <label class="col-md-3 control-label">Packaging Type</label>
                                                                                 <div class="col-md-5">
                                                                                     <select id="folder2" class="form-control">
                                                                                         <option>Please choose</option>
@@ -899,7 +989,8 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                             <a href="javascript:;" class="btn btn-outline green button-next2"> Next
 																	<i class="fa fa-angle-right"></i>
 																</a>
-                                                                            <a href="chat.html" class="btn green button-submit2"> Finish
+                                                                            <a onclick="confirm('This order saved as Draft. This is the link you requested https://gitlab.com/ciefworldwide/IZYIM.git')" class="btn green button-submit2" data-toggle="modal" href="marking"> Finish
+                                                                                
 																	<i class="fa fa-check"></i>
 																</a>
                                                                         </div>
diff --git a/public/Importer/shippingorderstatus.html b/public/Importer/shippingorderstatus.html
index ac4bb71..c6a8f6c 100644
--- a/public/Importer/shippingorderstatus.html
+++ b/public/Importer/shippingorderstatus.html
@@ -64,12 +64,12 @@ License: You must have a valid license purchased only from themeforest(the above
 			min-width: 100px;
 		}
 		.table td, .table th {
-			font-size: 10px;
+			font-size: 12px;
 			text-align:center;
 			vertical-align: middle;
 		}
 		.table thead tr th{
-			font-size: 10px;
+			font-size: 12px;
 			text-align:center;
 			vertical-align: middle;
 		}
@@ -326,7 +326,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                 <thead>
                                                     <tr>
                                                         <th width="1%"> No </th>
-                                                        <th width="5%">  Order No <br/>
+                                                        <th width="3%">  Order No <br/>
                                                             <button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
                                                             <span class="fa fa-filter"></span></button>
                                                         </th>
@@ -334,7 +334,7 @@ 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="3%"> Marking <br/>
+														<th  width="2%"> Marking <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>
@@ -342,7 +342,7 @@ 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%"> Warehouse Name <br/>
+														<th width="5%"> Warehouse 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>
                                                         </th>