diff --git a/public/Importer/purchaseorder.html b/public/Importer/purchaseorder.html
index c99903b..1824b8a 100644
--- a/public/Importer/purchaseorder.html
+++ b/public/Importer/purchaseorder.html
@@ -331,14 +331,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                               <li><input onchange="filterme()" name="status" value="Failed" type="checkbox"/>&nbsp;Failed</li>                                                        
                                                               <li><input onchange="filterme()" name="status" value="Cancel" type="checkbox"/>&nbsp;Cancel</li>                  
                                                           </ul>
-                                                        </th>
-                                                        <th width="1%">  SO Status <br/>
-                                                            <button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
-                                                            <span class="fa fa-filter"></span></button>
-                                                            <ul class="dropdown-menu">
-                                                              <li><input onchange="filterme()" name="status" value="Delivered" type="checkbox"/>&nbsp;Complete</li>  
-                                                              <li><input onchange="filterme()" name="status" value="Failed" type="checkbox"/>&nbsp;Incomplete</li>
-                                                          </ul>
                                                         </th>
 														<th  width="1%"> Date <br/>
                                                             <button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -378,6 +370,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                                               <li><input onchange="filterme()" name="orderno" value="00001" type="checkbox"/>&nbsp;Canceled</li>
                                                               <li><input onchange="filterme()" name="orderno" value="00002" type="checkbox"/>&nbsp;Amended</li>
                                                             </ul>
+                                                        </th>
+                                                        <th width="1%">  SO Status <br/>
+                                                            <button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+                                                            <span class="fa fa-filter"></span></button>
+                                                            <ul class="dropdown-menu">
+                                                              <li><input onchange="filterme()" name="status" value="Delivered" type="checkbox"/>&nbsp;Complete</li>  
+                                                              <li><input onchange="filterme()" name="status" value="Failed" type="checkbox"/>&nbsp;Incomplete</li>
+                                                          </ul>
                                                         </th>
 														<th width="1%"> Action <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -393,11 +393,11 @@ License: You must have a valid license purchased only from themeforest(the above
 													<tr>
                                                         <td> <center>1</center> </td>
                                                         <td> <span style='color:#08afed;font-weight: 700;'>12345</span> </td>
-                                                        <td>  <span style='color:#FF0000;font-weight: 700;'> Incomplete </span> </td>
                                                         <td> 03-07-2017 </td>
-                                                        <td> Tom Warehouse <br>Venue:61250, Dongguan</td>
+                                                        <td> CIEF Worldwide Sdn Bhd <br>Venue:61250, Dongguan</td>
                                                         <td> (MYR)12,000</td>
                                                         <td> <span style='color:#002EFF;font-weight: 700;'> Amended </span></td>
+                                                        <td> <a href="shippingorderstatus.html"><span style='color:#FF0000;font-weight: 700;' > Incomplete </span></a></td>
 														<td><center>
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul>
@@ -407,11 +407,11 @@ License: You must have a valid license purchased only from themeforest(the above
                                                     <tr>
                                                         <td> <center>2</center> </td>
                                                         <td> <span style='color:#08afed ;font-weight: 700;'>45678</span> </td>
-                                                        <td>  Complete </td>
                                                         <td> 02-07-2017 </td>
-                                                        <td> Bob Supply Warehouse <br>Venue:61250, Hong Kong</td>
+                                                        <td> Homemade Market <br>Venue:61250, Hong Kong</td>
 														<td> (MYR)21,000</td>
                                                          <td> <span style='color:#002EFF;font-weight: 700;'> Amended </span></td>
+                                                        <td> Complete </td>
                                                         <td><center>
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul>
@@ -421,11 +421,11 @@ License: You must have a valid license purchased only from themeforest(the above
                                                     <tr>
                                                         <td> <center>3</center> </td> 
                                                         <td> <span style='color:#08afed ;font-weight: 700;'>90123</span> </td>
-                                                        <td>   <span style='color:#FF0000;font-weight: 700;'> Incomplete </span> </td>
                                                         <td> 01-07-2017 </td>
-                                                        <td> Bob Supply Warehouse <br>Venue:61250, Hong Kong</td>
+                                                        <td> Talent Cloud Sdn Bhd <br>Venue:61250, Hong Kong</td>
                                                         <td> (MYR)18,000</td>
                                                         <td> <span style='color:#FF0000;font-weight: 700;'> Canceled </span></td>
+                                                        <td> <a href="shippingorderstatus.html"><span style='color:#FF0000;font-weight: 700;'> Incomplete </span></a> </td>
                                                         <td><center>
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul>
@@ -435,11 +435,11 @@ License: You must have a valid license purchased only from themeforest(the above
                                                     <tr>
                                                         <td> <center>4</center> </td>
                                                         <td> <span style='color:#08afed;font-weight: 700;'>99814</span> </td>
-                                                        <td> Complete </td>
 														<td> 01-07-2017 </td>
-                                                        <td> Tom Warehouse <br>Venue:61250, Dongguan</td>
+                                                        <td> Serv Sdn Bhd <br>Venue:61250, Dongguan</td>
                                                         <td> (MYR)10,000</td>
                                                         <td> <span style='color:#FF0000;font-weight: 700;'> Canceled </span></td>
+                                                        <td> Complete</td>
                                                         <td><center>
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul>
diff --git a/public/Importer/purchaseorder2.html b/public/Importer/purchaseorder2.html
index 1dd5a10..5605e8b 100644
--- a/public/Importer/purchaseorder2.html
+++ b/public/Importer/purchaseorder2.html
@@ -242,7 +242,7 @@
                                                             <a href="#tab1" data-toggle="tab" class="step">
                                                                 <span class="number"> 1 </span>
                                                                 <span class="desc">
-                                                                    <i class="fa fa-check"></i> Choose <br>Forwarder </span>
+                                                                    <i class="fa fa-check"></i>Buyer &<br>Forwarder </span>
                                                             </a>
                                                         </li>
                                                         <li>
@@ -265,20 +265,17 @@
                                                     </div>
                                                     <div class="tab-content">
                                                         <div class="tab-pane active" id="tab1">
-                                                            <h3 class="block"><b>List Forwarder</b></h3>
+                                                            <div class="portlet-title">
+                                                            <div class="caption" >
+                                                                <i class="icon-social-dribbble font-green hide"></i>
+                                                                <span class="caption-subject font-dark bold uppercase">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;List Forwarder</span>
+                                                            </div>
+                                                            </div>
+                                                            <br>
                                                             <div class="row">
                                                                 <div class="col-md-8">
                                                                     <div class="form-group">
                                                                         <label class="control-label col-md-3" style="font-size: 100%">Forwarder</label>
-                                                                        <!-- <div class="col-md-9">
-                                                                            <select id="folder" class="form-control select2">
-                                                                                    <option>Please select your forwarder</option>
-                                                                                    <option value="../assets/layouts/layout/img/avatar3_small.jpg">CIEF Worldwide</option>
-                                                                                    <option value="001">Magic Cyberjaya</option>
-                                                                                    <option value="002">Arleta</option>
-                                                                                    <option value="003">Home Made Market</option>
-                                                                            </select> 
-                                                                        </div> -->
      <div class="col-md-9" class="btn-group">
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Please Choose Forwarder
     <span class="glyphicon glyphicon-chevron-down"></span>
@@ -303,6 +300,13 @@
                                                                 </div>
 
                                                             </div>
+                                                            <div class="portlet-title">
+                                                            <div class="caption">
+                                                                <i class="icon-social-dribbble font-green hide"></i>
+                                                                <span class="caption-subject font-dark bold uppercase">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Buyer Details</span>
+                                                            </div>
+                                                            </div>
+                                                            <br>
                                                             <div class="row">
                                                             <div class="col-md-8">
                                                                     <div class="form-group">
@@ -377,35 +381,17 @@
                                         <div class="portlet-title">
                                             <div class="caption">
                                                 <i class="icon-social-dribbble font-green hide"></i>
-                                                <span class="caption-subject font-dark bold uppercase">Details Seller</span>
+                                                <span class="caption-subject font-dark bold uppercase"> Seller Details</span>
                                             </div>
                                         </div>
                                                          <div class="row">
                                                                 <div class="col-md-8">
                                                                     <div class="form-group">
-                                                                        <label class="control-label col-md-3">Supplier</label>
+                                                                        <label class="control-label col-md-3">Supplier Company Name</label>
                                                                         <div class="col-md-9">
                                                                             <input type="text" class="form-control"></div>
                                                                     </div>
                                                                 </div>
-                                                            </div>
-                                                             <div class="row">
-                                                                <div class="col-md-8">
-                                                                    <div class="form-group">
-                                                                        <label class="control-label col-md-3">Date</label>
-                                                                        <div class="col-md-9">
-                                                                            <input type="text" class="form-control"> </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                         <div class="row">
-                                                                <div class="col-md-8">
-                                                                    <div class="form-group">
-                                                                        <label class="control-label col-md-3">Seller Company</label>
-                                                                        <div class="col-md-9">
-                                                                            <input type="text" class="form-control"> </div>
-                                                                    </div>
-                                                                </div>
                                                             </div>
                                                             <div class="row">
                                                                 <div class="col-md-8">
@@ -424,11 +410,20 @@
                                                                             <input type="text" class="form-control"> </div>
                                                                     </div>
                                                                 </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-8">
+                                                                    <div class="form-group">
+                                                                        <label class="control-label col-md-3">Bank Name</label>
+                                                                        <div class="col-md-9">
+                                                                            <input type="text" class="form-control"> </div>
+                                                                    </div>
+                                                                </div>
                                                             </div>
                                                              <div class="row">
                                                                 <div class="col-md-8">
                                                                     <div class="form-group">
-                                                                        <label class="control-label col-md-3">Account No</label>
+                                                                        <label class="control-label col-md-3">Account Address</label>
                                                                         <div class="col-md-9">
                                                                             <input type="text" class="form-control"> </div>
                                                                     </div>
@@ -437,12 +432,26 @@
                                                             <div class="row">
                                                                 <div class="col-md-8">
                                                                     <div class="form-group">
-                                                                        <label class="control-label col-md-3">Bank Name</label>
+                                                                        <label class="control-label col-md-3">Swift Code</label>
                                                                         <div class="col-md-9">
                                                                             <input type="text" class="form-control"> </div>
                                                                     </div>
                                                                 </div>
                                                             </div>
+                                                            <div class="row">
+                                                                <div class="col-md-8">
+                                                                     <div class="form-group">
+                                                                        <label class="col-md-3 control-label">Choose Currency</label>
+                                                                        <div class="col-md-9">
+                                                                            <select class="form-control">
+                                                                                <option>Select</option>
+                                                                                <option>(RMB) China</option>
+                                                                               <option>(MYR) Malaysia</option>
+                                                                            </select>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
                                                             <div class="input-group-btn">
 		                                                    <button type="button" class="btn green">
 		                                                        <i class="icon-plus">Add New Input</i>
@@ -478,13 +487,12 @@
                                                 <tr>
                                                     <th> No. </th>
                                                     <th> Item Code </th>
-                                                    <th> Upload Photo </th>
                                                     <th> Model No </th>
                                                     <th> Description </th>
                                                     <th> Quantity </th>
                                                     <th> OUM</th>
                                                     <th> Unit Price</th>
-                                                    <th> Total</th>
+                                                    <th> Sub Total</th>
                                                     <th> Actions</th>
                                                 </tr>
                                             </thead>
@@ -492,11 +500,10 @@
                                                 <tr>
                                                 	<td> 1.</td>
                                                 	<td contenteditable="true"> QR 123</td>
-                                                	<td> <a href=""><img src="../assets/pages/media/works/img7.jpg" style="width:77px"> images.jpg</a></td>
                                                     <td contenteditable="true"> Model 123</td>
                                                     <td contenteditable="true"> Fidget Spinner </td>
                                                     <td contenteditable="true"> 3 </td>
-                                                    <td contenteditable="true"> height:10cm<br>width:5cm<br>length:12cm </td>
+                                                    <td contenteditable="true"> package</td>
                                                     <td contenteditable="true"> RM 5 </td>
                                                     <td contenteditable="true"> RM 15 </td>
                                                     <td><div class="fa-item col-md-3 col-sm-4">
@@ -506,11 +513,10 @@
                                                 <tr>
                                                     <td> 2. </td>
                                                     <td contenteditable="true"> QR 456</td>
-                                                	<td> <a href=""><img src="../assets/pages/media/works/img8.jpg" style="width:77px"> images.jpg</a></td>
                                                     <td contenteditable="true"> Model 456</td>
                                                     <td contenteditable="true"> Vacuum Cleaner </td>
                                                     <td contenteditable="true"> 2 </td>
-                                                    <td contenteditable="true"> height:10cm<br>width:5cm<br>length:12cm </td>
+                                                    <td contenteditable="true"> pallet</td>
                                                     <td contenteditable="true"> RM 25 </td>
                                                     <td contenteditable="true"> RM 50 </td>
                                                     <td>
@@ -521,11 +527,10 @@
                                                 <tr>
                                                     <td> 3. </td>
                                                     <td contenteditable="true"> QR 789</td>
-                                                	<td> <a href=""><img src="../assets/pages/media/works/img9.jpg" style="width:77px"> images.jpg</a></td>
                                                     <td contenteditable="true"> Model 789</td>
                                                     <td contenteditable="true"> Boxes </td>
                                                     <td contenteditable="true"> 5 </td>
-                                                    <td contenteditable="true"> height:10cm<br>width:5cm<br>length:12cm </td>
+                                                    <td contenteditable="true"> pallet</td>
                                                     <td contenteditable="true"> RM 7 </td>
                                                     <td contenteditable="true"> RM 35 </td>
                                                     <td>
@@ -536,11 +541,10 @@
                                                 <tr>
                                                     <td> 4. </td>
                                                     <td contenteditable="true"> QR 234</td>
-                                                	<td> <a href=""><img src="../assets/pages/media/works/img8.jpg" style="width:77px"> images.jpg</a></td>
                                                     <td contenteditable="true"> Model 234</td>
                                                     <td contenteditable="true"> Bottles </td>
                                                     <td contenteditable="true"> 8 </td>
-                                                    <td contenteditable="true"> height:10cm<br>width:5cm<br>length:12cm </td>
+                                                    <td contenteditable="true"> pallet </td>
                                                     <td contenteditable="true"> RM 9 </td>
                                                     <td contenteditable="true"> RM 72 </td>
                                                     <td>