diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html
index f625b5b..2206e5c 100644
--- a/public/Importer/shippingorder.html
+++ b/public/Importer/shippingorder.html
@@ -289,6 +289,13 @@ License: You must have a valid license purchased only from themeforest(the above
 															<i class="fa fa-check"></i> Items </span>
                                                         </a>
                                                     </li>
+                                                    <li>
+                                                        <a href="#tab3" data-toggle="tab" class="step">
+                                                            <span class="number"> 3 </span>
+                                                            <span class="desc">
+															<i class="fa fa-check"></i> Packing </span>
+                                                        </a>
+                                                    </li>
                                                 </ul>
                                                 <div id="bar" class="progress progress-striped" role="progressbar">
                                                     <div class="progress-bar progress-bar-success"> </div>
@@ -439,12 +446,92 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                             
                                                                             <a onclick="addNewColumn();" style="margin-left: 10px;" class="btn green"><i class="fa fa-plus"></i> New Column</a>
                                                                         </div>
-                                                                        <a class="btn green" style="margin-left: 10px;" data-toggle="modal" href="#addnew">
+                                                                        <a class="btn green" style="margin-left: 10px;" data-toggle="modal" href="#newitem">
                                                                             <i class="fa fa-plus"></i> Add New Item 
                                                                         </a>
                                                                         
                                                                     </div>
                                                                 </div>
+                                                                <table id="table1" class="table table-bordered table-striped">
+                                                                    <thead>
+                                                                        <th>No</th>
+                                                                        <th>Product Name</th>
+                                                                        <th>Model</th>
+                                                                        <th>UOM</th>
+                                                                        <th>Qty</th>
+                                                                        <th>Photo</th>
+                                                                        <th contenteditable="true">Remark</th>
+
+                                                                    </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><img src="../assets/global/img/tv.jpg" data-toggle="modal" href="#tv" 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 ><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 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><img src="../assets/global/img/chair.jpg" data-toggle="modal" href="#chair" alt="" style="width:100px;height:100px;"/> </td>
+                                                                            <td> </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 ><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>
+                                                                </table>
+
+                                                                
+                                                            </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="tab-pane" id="tab3">
+                                                        <div class="row">
+                                                            <div class="col-md-12">
+																<div class="portlet light bordered">
+                                                                <i class="icon-social-dribbble font-green hide"></i>
+                                                                <span class="caption-subject font-dark bold uppercase"><h4><strong>Packing Goods</strong></h4></span>
+                                                                <div class="table-toolbar" align="right">
+                                                                    <div class="row">
+                                                                        
+                                                                        <a class="btn green" style="margin-left: 10px;" data-toggle="modal" href="#addnew">
+                                                                            <i class="fa fa-plus"></i> Add New Packing
+                                                                        </a>
+                                                                        
+                                                                    </div>
+                                                                </div>
                                                                 <table id="table1" class="table table-bordered table-striped">
                                                                     <thead>
                                                                         <th>No</th>
@@ -738,17 +825,17 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <div class="form-body">
                                                                 <ul class="nav nav-pills nav-justified steps" id="modal-tabs">
                                                                     <li>
-                                                                        <a href="#item" data-toggle="tab" class="step">
+                                                                        <a href="#packing" data-toggle="tab" class="step">
                                                                             <span class="number"> 1 </span>
                                                                             <span class="desc">
-                                                                        <i class="fa fa-check"></i>Item</span>
+                                                                        <i class="fa fa-check"></i>Packing</span>
                                                                         </a>
                                                                     </li>
                                                                     <li>
-                                                                        <a href="#packing" data-toggle="tab" class="step">
+                                                                        <a href="#item" data-toggle="tab" class="step">
                                                                             <span class="number"> 2 </span>
                                                                             <span class="desc">
-                                                                        <i class="fa fa-check"></i> Packing </span>
+                                                                        <i class="fa fa-check"></i> Select </span>
                                                                         </a>
                                                                     </li>
                                                                 </ul>
@@ -756,76 +843,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     <div class="progress-bar progress-bar-success"> </div>
                                                                 </div>
                                                                 <div class="tab-content">
-                                                                    <div class="tab-pane active" id="item">
-                                                                        <h3 class="block">Product Details</h3>
-                                                                        <div class="col-md-6">
-                                                                            <h5><strong> </strong></h5>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">Product Name
-                                                                                    <span class="required"> * </span>
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <input type="text" class="form-control" name="productname" placeholder="Television" />
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">Description
-                                                                                    <span class="required"> * </span>
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <input type="textarea" class="form-control" name="description" placeholder="42 inch" />
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">Photo
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                                                                        <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
-                                                                                            <img src="http://www.placehold.it/200x150/EFEFEF/AAAAAA&amp;text=no+image" alt="" />
-                                                                                        </div>
-                                                                                        <div>
-                                                                                            <span class="fileinput-new"></span>
-                                                                                            <span class="fileinput-exists"></span>
-                                                                                            <input type="file" name="...">
-                                                                                        </div>
-                                                                                    </div>
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">Brand
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <input type="text" class="form-control" name="brand" placeholder="Sharp" />
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="col-md-6">
-                                                                            <h5><strong> </strong></h5>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">Model
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <input type="text" class="form-control" name="model" placeholder="ESW1452" />
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">UOM
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <input type="text" class="form-control" name="uom" placeholder="Roll" />
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="form-group">
-                                                                                <label class="control-label col-md-3">Quantity
-                                                                                    <span class="required"> * </span>
-                                                                                </label>
-                                                                                <div class="col-md-6">
-                                                                                    <input type="text" class="form-control" name="quantity" placeholder="4" />
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
                                                                     <div class="tab-pane" id="packing">
                                                                         <h3 class="block">Packing Details</h3>
                                                                         <div class="col-md-6">
@@ -990,6 +1007,70 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                             </div>
                                                                         </div>
                                                                     </div>
+                                                                    <div class="tab-pane active" id="item">
+                                                                        <div class="tab-pane" id="list">
+                                                                            <table id="table1" class="table table-bordered table-striped">
+                                                                        <thead>
+                                                                            <th>No</th>
+                                                                            <th>Product Name</th>
+                                                                            <th>Model</th>
+                                                                            <th>UOM</th>
+                                                                            <th>Qty</th>
+                                                                            <th>Photo</th>
+                                                                            <th> Select </th>
+
+
+                                                                        </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><img src="../assets/global/img/tv.jpg" data-toggle="modal" href="#tv" alt="" style="width:100px;height:75px;" />
+                                                                                </td>
+                                                                                <td> <input type="checkbox" class="checkboxes"></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 ><img src="../assets/global/img/tire.jpg" data-toggle="modal" href="#tire" alt="" style="width:100px;height:100px;" /> </td>
+                                                                                <td> <input type="checkbox" class="checkboxes"></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><img src="../assets/global/img/chair.jpg" data-toggle="modal" href="#chair" alt="" style="width:100px;height:100px;"/> </td>
+                                                                                <td> <input type="checkbox" class="checkboxes"></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 ><img src="../assets/global/img/table.jpg" data-toggle="modal" href="#tbl" alt="" style="width:100px;height:100px;" /> </td>
+                                                                                <td> <input type="checkbox" class="checkboxes"></td>
+
+                                                                            </tr>
+                                                                        </tbody>
+                                                                    </table>
+                                                                </div>
+                                                                    </div>
                                                                 </div>
                                                                 <div class="form-actions">
                                                                     <div class="row">
@@ -999,7 +1080,7 @@ 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 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
+                                                                            <a href="javascript:;" class="btn green button-submit2"> Finish
                                                                                 
 																	<i class="fa fa-check"></i>
 																</a>
@@ -1025,6 +1106,108 @@ License: You must have a valid license purchased only from themeforest(the above
                         </div>
                     </div>
                 </div>
+        
+        <div class="modal fade" id="newitem" tabindex="-1" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-body">
+                        <div class="row">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+                                <div class="caption">
+                                    <h3><i class="fa fa-plus-square-o" aria-hidden="true"></i> Add New Packing</h3>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="portlet light bordered" id="form_wizard_3">
+                                        <div class="portlet-body form">
+                                            <form class="form-horizontal" action="#" id="submit_form" method="POST">
+                                                <div class="tab-pane active" id="item">
+                                                    <h3 class="block">Product Details</h3>
+                                                    <div class="col-md-6">
+                                                        <h5><strong> </strong></h5>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">Product Name
+                                                                <span class="required"> * </span>
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <input type="text" class="form-control" name="productname" placeholder="Television" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">Description
+                                                                <span class="required"> * </span>
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <input type="textarea" class="form-control" name="description" placeholder="42 inch" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">Photo
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <div class="fileinput fileinput-new" data-provides="fileinput">
+                                                                    <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
+                                                                        <img src="http://www.placehold.it/200x150/EFEFEF/AAAAAA&amp;text=no+image" alt="" />
+                                                                    </div>
+                                                                    <div>
+                                                                        <span class="fileinput-new"></span>
+                                                                        <span class="fileinput-exists"></span>
+                                                                        <input type="file" name="...">
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">Brand
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <input type="text" class="form-control" name="brand" placeholder="Sharp" />
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-md-6">
+                                                        <h5><strong> </strong></h5>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">Model
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <input type="text" class="form-control" name="model" placeholder="ESW1452" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">UOM
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <input type="text" class="form-control" name="uom" placeholder="Roll" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="control-label col-md-3">Quantity
+                                                                <span class="required"> * </span>
+                                                            </label>
+                                                            <div class="col-md-6">
+                                                                <input type="text" class="form-control" name="quantity" placeholder="4" />
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+        
+        
     <!-- END CONTAINER -->
 
     <!-- BEGIN FOOTER -->