diff --git a/public/Importer/orderdetails.html b/public/Importer/orderdetails.html
index fff4062..86f6f06 100644
--- a/public/Importer/orderdetails.html
+++ b/public/Importer/orderdetails.html
@@ -373,117 +373,136 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     <div class="caption"><b>Packaging List </b></div>
                                                                 </div>
                                                                 <div class="portlet-body">
-                                        <h4>Carton</h4>
-                                        <div class = "table-responsive">
-                                        <table id="user" class="table table-bordered table-striped">
-                                            <thead>
-                                                <th>Export HS Code</th>
-                                                <th>Product Model</th>
-                                                <th>Brand</th>
-                                                <th>Goods Description(EN)</th>
-                                                <th>Goods Description(CHN)</th>
-                                                <th>Product Photo</th>
-                                                <th>Packaging Photo</th>
-                                                <th>Qty/Ctn</th>
-                                                <th>Qty of Ctn</th>
-                                                <th>Ctn Label</th>
-                                            </thead>
-                                            <tbody>
-                                                <tr>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                </tr>
-                                                <tr>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                </tr>
-                                                <tr>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
+                                        <div class="portlet box green">
+                                        <div class="portlet-title">
+                                            <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>1 </td>
+                                                            <td>Television </td>
+                                                            <td>CS110 </td>
+                                                            <td>Unit </td>
+                                                            <td>10 </td>
+                                                            <td>12 </td>
+                                                            <td>15</td>
+                                                            <td>12</td> 
+                                                            <td>12</td>
+                                                            <td>15</td>    
+                                                            <td><img src="../assets/global/img/tv.jpg" alt="" style="width:100px;height:75px;" /></td>
+                                                            <td> Any Remark</td>
+
+
+                                                        </tr>
+                                                        <tr>
+                                                            <td>2 </td>
+                                                            <td>Tire </td>
+                                                            <td>CS251 </td>
+                                                            <td>Unit </td>
+                                                            <td>20 </td>
+                                                            <td>12 </td>
+                                                            <td>15</td>
+                                                            <td>12</td> 
+                                                            <td>12</td>
+                                                            <td>15</td> 
+                                                            <td><img src="../assets/global/img/tire.jpg" alt="" style="width:100px;height:100px;" /> </td>
+                                                            <td> Any Remark</td>
+
+                                                        </tr>
+                                                        <tr>
+                                                            <td>3 </td>
+                                                            <td>Chair </td>
+                                                            <td>CS486 </td>
+                                                            <td>Unit </td>
+                                                            <td>5 </td>
+                                                            <td>12 </td>
+                                                            <td>15</td>
+                                                            <td>12</td> 
+                                                            <td>12</td>
+                                                            <td>15</td> 
+                                                            <td><img src="../assets/global/img/chair.jpg" alt="" style="width:100px;height:100px;" />  </td>
+                                                            <td> Any Remark</td>
+
+                                                        </tr>
+                                                        <tr>
+                                                            <td>4 </td>
+                                                            <td>Table </td>
+                                                            <td>CS125 </td>
+                                                            <td>Unit </td>
+                                                            <td>5 </td>
+                                                            <td>12 </td>
+                                                            <td>15</td>
+                                                            <td>12</td> 
+                                                            <td>12</td>
+                                                            <td>15</td> 
+                                                            <td><img src="../assets/global/img/table.jpg" alt="" style="width:100px;height:100px;" /> </td>
+                                                            <td> Any Remark</td>
+
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
                                         </div>
-                                        <br>
-                                        <br>
-                                        <h4>Pallet</h4>
-                                        <div class = "table-responsive">
-                                        <table id="user" class="table table-bordered table-striped">
-                                            <thead>
-                                                <th>Export HS Code</th>
-                                                <th>Product Model</th>
-                                                <th>Brand</th>
-                                                <th>Goods Description(EN)</th>
-                                                <th>Goods Description(CHN)</th>
-                                                <th>Product Photo</th>
-                                                <th>Packaging Photo</th>
-                                                <th>Qty/Plt</th>
-                                                <th>Qty of Plt</th>
-                                                <th>Ctn Label</th>
-                                            </thead>
-                                            <tbody>
-                                                <tr>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                </tr>
-                                                <tr>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                </tr>
-                                                <tr>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                    <td> </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
                                         </div>
                                             </div>
                                         
@@ -568,50 +587,100 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                <div class="portlet-title">
                                                                     <div class="caption"><b>Warehouse Receive Note (WRN) </b></div>
                                                                 </div>
-                                                                <div class="tab-pane" id="tab_images">
-                                                        <div class="row">
-                                                            <div id="tab_images_uploader_filelist" class="col-md-6 col-sm-12"> </div>
-                                                        </div>
-                                                        <table class="table table-bordered table-hover">
-                                                            <thead>
-                                                                <tr role="row" class="heading">
-                                                                    <th width="10%"> Image </th>
-                                                                    <th width="15%"> Total Ctn </th>
-                                                                    <th width="15%"> Measurement </th>
-                                                                    <th width="15%"> Weight </th>
-                                                                </tr>
-                                                            </thead>
-                                                            <tbody>
-                                                                <tr>
-                                                                    <td>
-                                                                        <a href="../assets/pages/media/works/img1.jpg" class="fancybox-button" data-rel="fancybox-button">
+
+                                                                <div class="portlet-body">
+                                                                    <div class="table-scrollable" style="max-width:900px; font-size:100px;">
+                                                                    <table class="table table-striped table-bordered table-hover" id="sample_editable_1">
+                                                                    <thead>
+                                                                    <tr>
+                                                                    <th scope="col">No</th>
+                                                                    <th scope="col">Total Ctn<br>(nominal)</th>
+                                                                    <th scope="col">Measurement-m<br>(nominal)</th>
+                                                                    <th scope="col">Weight<br>(nominal)</th>
+                                                                    <th scope="col">Total Ctn<br>(actual)</th>
+                                                                    <th scope="col">Measurement-m<br>(actual)</th>
+                                                                    <th scope="col">Weight<br>(actual)</th>
+                                                                    <th scope="col">Status</th>
+                                                                    <th scope="col">Image</th>                                       
+                                                                    </tr>
+                                                                </thead>
+                                                                <tfoot>
+                                                                    <tr>
+                                                                        <td style="color: black">Total</td>
+                                                                        <td style="color: black">12 ctn</td>
+                                                                        <td style="color: black">3.6 CBM</td>
+                                                                        <td style="color: black">10 kg</td>
+                                                                        <td style="color: black">11 ctn</td>
+                                                                        <td style="color: black" >3.6 CBM</td>
+                                                                        <td style="color: black">29.8 kg</td>
+                                                                        <td style="color: black"></td>
+                                                                        <td>
+                                                                            
+                                                                        </td>
+                                                                        <td>
+                                                                            
+                                                                        </td>
+                                                                       
+                                                                </tfoot>
+                                                                <tbody>
+                                                                    <tr>
+                                                                        <td>1</td>
+                                                                        <td>4</td>
+                                                                        <td>40x40x40</td>
+                                                                        <td>10kg</td>
+                                                                        <td style="color: blue"> 4 </a>
+                                                                        </td>
+                                                                        <td style="color: blue"> 40 x 40 x 40</a>
+                                                                        </td>
+                                                                        <td style="color: blue"> 10kg </a>
+                                                                        </td>
+                                                                        <td>Matched</td>
+                                                                        <td><a href="../assets/pages/media/works/img1.jpg" class="fancybox-button" data-rel="fancybox-button">
                                                                             <img class="img-responsive" src="../assets/pages/media/works/img7.jpg" alt=""> </a>
-                                                                    </td>
-                                                                    <td>10</td>
-                                                                    <td>40x40x40</td>
-                                                                    <td>9.8 KG</td>
-                                                                </tr>
-                                                                <tr>
-                                                                    <td>
-                                                                        <a href="../assets/pages/media/works/img2.jpg" class="fancybox-button" data-rel="fancybox-button">
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td>2</td>
+                                                                        <td style="color: red">4</td>
+                                                                        <td >0.4x0.4x0.4</td>
+                                                                        <td >10kg</td>
+                                                                        <td style="color: red"> 3 </a>
+                                                                        </td>
+                                                                        <td style="color: blue" > 0.4 x 0.4 x 0.4</a>
+                                                                        </td>
+                                                                        <td style="color: blue" > 10kg </a>
+                                                                        </td>
+                                                                        <td style="color: red">Unmatched</a></td>
+                                                                        <td><a href="../assets/pages/media/works/img2.jpg" class="fancybox-button" data-rel="fancybox-button">
                                                                             <img class="img-responsive" src="../assets/pages/media/works/img8.jpg" alt=""> </a>
-                                                                    </td>
-                                                                    <td>9</td>
-                                                                    <td>40x40x40</td>
-                                                                    <td>9.8 KG</td>
-                                                                </tr>
-                                                                <tr>
-                                                                    <td>
-                                                                        <a href="../assets/pages/media/works/img3.jpg" class="fancybox-button" data-rel="fancybox-button">
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td>3</td>
+                                                                        <td >4</td>
+                                                                        <td >0.4x0.4x0.4</td>
+                                                                        <td style="color: red">10kg</td>
+                                                                        <td style="color: blue" > 4 </a>
+                                                                        </td>
+                                                                        <td style="color: blue" > 0.4 x 0.4 x 0.4</a>
+                                                                        </td>
+                                                                        <td style="color: red"> 9.8kg </a>
+                                                                        </td>
+                                                                        <td style="color: red">Unmatched <br></td>
+                                                                        <td> <a href="../assets/pages/media/works/img3.jpg" class="fancybox-button" data-rel="fancybox-button">
                                                                             <img class="img-responsive" src="../assets/pages/media/works/img9.jpg" alt=""> </a>
-                                                                    </td>
-                                                                    <td>8</td>
-                                                                    <td>40x40x40</td>
-                                                                    <td>9.8 KG</td>
-                                                                </tr>
-                                                            </tbody>
-                                                        </table>
+                                                                        </td>
+                                                                    </tr>
+                                                                    
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                        
+                                                        
                                                     </div>
+
+
+                                                                <!-- ------------ -->
                                                             </div>
                                                         </div>
                                                     </div>