diff --git a/public/Forwarder/deliveryarrange.html b/public/Forwarder/deliveryarrange.html
index 5f7c170..336523b 100644
--- a/public/Forwarder/deliveryarrange.html
+++ b/public/Forwarder/deliveryarrange.html
@@ -260,7 +260,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <span class="arrow"></span>
                                 </a>
                                 <ul class="sub-menu">
-                                    <li class="nav-item  ">
+                                    <li class="nav-item start ">
                                         <a href="deliveryarrange.html" class="nav-link ">
                                             <i class="icon-clock"></i>
                                             <span class="title">Delivery Arrangement</span>
@@ -442,6 +442,8 @@ License: You must have a valid license purchased only from themeforest(the above
 											<table id="example" class="table table-striped table-bordered table-hover order-column"></table>
 											
                                         </div>
+                                        <h5>Total CBM: 40 CBM</h5>
+                                        <h5>Total Weight:100 KG</h5>
                                     </div>
                                 </div>
                                 <!-- End: life time stats -->
@@ -582,26 +584,39 @@ License: You must have a valid license purchased only from themeforest(the above
 											<table id="example2" class="table table-striped table-bordered table-hover"></table>
 											<!--<input name="total" id="total" type="text"  value=0 />-->
 											<!--<p id="total" class="form-control-static"> </p>-->
-                                        </div>
+                                       
+                                        <h5>Total CBM: </h5>
+                                        <h5>Total Carton: </h5>
+                                        <h5>Total Weight: </h5>
 										<br>
 										<div class="form">
 											<div class="row">
 												<div class="col-md-12">
-														<h5>Message</h5>
+														<h5>Notification</h5>
 														<hr>
 													<div class="form-group">
 														<div class="row">
 															<div class="col-md-10">
 																<textarea id="message" class="form-control" rows="10">
-CIEF Delivery Message
+Delivery Request
 
-Order No: <<order_no>> 
-Delivery Date: 03-07-2017
-Driver Name: Bob 
-Driver Contact No: 013-3456789
-Vehicle No: WAA 123 C
+Order No: #[ORDER NO] 
+From Supplier: #[SUPPLIER NAME]
+Total Qty: #[TOTAL] #[UOM]
+Total CBM: #[TOTAL CBM]
+EDD: #[DATE]
+Delivery Date: [DATE]
+Driver Name: [NAME]
+Vehicle No: [CAR PLATE NO.] 
+Driver Contact No: [CONTACT NO.]
 
-* Kindly proceed to the messenger to confirm
+Pls confirm the delivery date to confirm your warehouse is available.
+* Pls confirm your warehouse manpower is ready and all equipment are ready as well. 
+Exp: Forklift, Troly & etc.
+
+Thank You Very Much.
+
+[Forwarder Company Name]
 </textarea>
 															</div>
 															<div class="col-md-2">
@@ -1266,23 +1281,23 @@ Vehicle No: WAA 123 C
 		
 			
             var dataSet = [
-				["1","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00006 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0008","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","03-07-2017","<span style='color:red'><strong>03-07-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
-				["2","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00005 </a>","CIEF/0007","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","02-07-2017","02-07-2017","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
-				["3","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00004 </a>","CIEF/0006","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","01-07-2017","<span style='color:red'><strong>01-07-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
-				["4","03-07-2017","Vehicle No:JNY1122<br/>Contact Person:Handsome<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00003 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","30-06-2017","<span style='color:red'><strong>30-06-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
-				["5","03-07-2017","Vehicle No:JNY1122<br/>Contact Person:Hantam<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00002 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","30-06-2017","<span style='color:red'><strong>30-06-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],				
-				["6","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
-				["7","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"],
-				["8","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","28-06-2017","28-06-2017","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"]
+				["1","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00006 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0008","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","10","","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
+				["2","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00005 </a>","CIEF/0007","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","14","","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
+				["3","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00004 </a>","CIEF/0006","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","23","","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
+				["4","03-07-2017","Vehicle No:JNY1122<br/>Contact Person:Handsome<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00003 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","12","","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
+				["5","03-07-2017","Vehicle No:JNY1122<br/>Contact Person:Hantam<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00002 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","23","","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],				
+				["6","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","21","","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Accepted</span><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle btn-outline' href='#reason' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
+				["7","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","16","","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"],
+				["8","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","Bangi<br>Selangor","123456","11","","Delivery Request <span style='color:#36c6d3;font-weight: 700;'>Completed</span>", "Completed"]
             ];
 			
             var dataSet2 = [
-				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","1","03-08-2017","CTN56","00006","CIEF/0008","Bangi<br>Selangor","CBM :<br/>Weight:<br/>Qty of Carton:"],
-				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","2","03-08-2017","CTN55","00005","CIEF/0007","Bangi<br>Selangor","CBM :<br/>Weight:<br/>Qty of Carton:"],
-				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","3","03-08-2017","CTN54","00004","CIEF/0006","Bangi<br>Selangor","CBM :<br/>Weight:<br/>Qty of Carton:"],
-				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","4","03-08-2017","CTN53","00003","CIEF/0005","Bangi<br>Selangor","CBM :<br/>Weight:<br/>Qty of Carton:"],
-				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","5","03-08-2017","CTN52","00002","CIEF/0004","Bangi<br>Selangor","CBM :<br/>Weight:<br/>Qty of Carton:"],
-				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","6","03-08-2017","CTN51","00001","CIEF/0003","Bangi<br>Selangor","CBM :<br/>Weight:<br/>Qty of Carton:"]
+				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","1","03-08-2017","CTN56","00006","CIEF/0008","Bangi<br>Selangor","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7", "CBM :<br/>Weight:<br/>Qty of Carton:"],
+				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","2","03-08-2017","CTN55","00005","CIEF/0007","Bangi<br>Selangor","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7","CBM :<br/>Weight:<br/>Qty of Carton:"],
+				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","3","03-08-2017","CTN54","00004","CIEF/0006","Bangi<br>Selangor","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7","CBM :<br/>Weight:<br/>Qty of Carton:"],
+				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","4","03-08-2017","CTN53","00003","CIEF/0005","Bangi<br>Selangor","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7","CBM :<br/>Weight:<br/>Qty of Carton:"],
+				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","5","03-08-2017","CTN52","00002","CIEF/0004","Bangi<br>Selangor","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7","CBM :<br/>Weight:<br/>Qty of Carton:"],
+				["<label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label>","6","03-08-2017","CTN51","00001","CIEF/0003","Bangi<br>Selangor","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7","CBM :<br/>Weight:<br/>Qty of Carton:"]
             ];
 
 			
@@ -1355,8 +1370,8 @@ Vehicle No: WAA 123 C
 					{ title: 'Customer<br>Details<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_6\')"></span>' },
 					{ title: 'Area<br>State<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_7\')"></span>' },
 					{ title: 'Container No<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_8\')"></span>' },
-					{ title: 'ETD<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_9\')"></span>' },
-					{ title: 'ETA<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_10\')"></span>' },
+					{ title: 'Qty Carton<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_9\')"></span>' },
+					{ title: 'Remark<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_10\')"></span>' },
 					{ title: 'Status<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_11\')"></span>' },
 					{ title: 'Stats' },
 				],
@@ -1410,12 +1425,13 @@ Vehicle No: WAA 123 C
 					{ title:  "Order <br/>No", className: "col_4"},
 					{ title:  "Cust <br/> Code", className: "col_5"},
 					{ title:  "Area<br/>State", className: "col_6"},
-					{ title:  "Details", className: "col_7"},
+                    { title:  "Address", className: "col_7"},
+					{ title:  "Details", className: "col_8"},
 					
 				],
 				"dom": "<'row' <'col-md-12'T>><'row'<'col-md-6'><'col-md-6'f>r>t<'row'<'col-md-5 col-sm-12'<'toolbar'>><'col-md-7 col-sm-12'p>>",
                 initComplete: function () {
-                    configFilter(this, [ 2,3, 4,5,6,7,8]);
+                    configFilter(this, [ 2,3, 4,5,6,7,8,9]);
                 }
             });
 			table1.columns( 12 ).search( 'Not Completed' ).draw();
diff --git a/public/Forwarder/index.html b/public/Forwarder/index.html
index b1e6803..7fcac42 100644
--- a/public/Forwarder/index.html
+++ b/public/Forwarder/index.html
@@ -412,13 +412,6 @@ License: You must have a valid license purchased only from themeforest(the above
 															  <li><input onchange="filterme()" name="orderno" value="00005" type="checkbox"/>&nbsp;00005</li>															  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Order Number"> PO<br/> No </a> <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="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
-															</ul> 
-														</th>
 														<th width="1%"> Supplier<br/> Code <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>
@@ -426,21 +419,14 @@ License: You must have a valid license purchased only from themeforest(the above
 															  <li><input onchange="filterme()" name="suppliercode" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Customer Code"> Cust<br/> Code </a> <br/>
+														<th width="1%">  Marking <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
 															  <li><input onchange="filterme()" name="custcode" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Agent Code"> Agent<br/> Code </a> <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="custcode" value="123456" type="checkbox"/>&nbsp;123456</li>														  
-															</ul>
-														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Value"> Purchase<br/> Val </a> <br/>
+														<th width="1%"> Purchase<br/> Value <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">
@@ -461,7 +447,21 @@ License: You must have a valid license purchased only from themeforest(the above
 															  <li><input onchange="filterme()" name="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Warehouse Receive Note"> Warehouse<br/> Recv<br/> Note </a> <br/>
+														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Warehouse Name"> WH Name <br/>
+															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
+															<span class="fa fa-filter"></span></button>
+															<ul class="dropdown-menu">
+															  <li><input onchange="filterme()" name="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
+															</ul>
+														</th>
+														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Warehouse Receive Note"> WH<br/> Recv<br/> Note </a> <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="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
+															</ul>
+														</th>
+														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Warehouse Remark"> WH<br/> Remark </a> <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">
@@ -496,13 +496,13 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00005<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 5 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-                                                        <td> 123456 </td>
 														<td> 123456 </td>
                                                         <td> CIEF/0008 </td>
-                                                        <td> 123456 </td>
                                                         <td> <center>12,000.00 (RMB)</center> </td>
                                                         <td> CTN56 </td>
 														<td> 123456 </td>
+                                                        <td> WH A </td>
+                                                        <td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> <span style="color:red"><strong>03-07-2017<br/>Delayed</strong></span> </td>
@@ -517,13 +517,13 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00004<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 10 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-														<td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> CIEF/0007 </td>
-                                                        <td> 123456 </td>
                                                         <td> <center>15,000.00 (USD)</center> </td>
                                                         <td> CTN55 </td>
                                                         <td> 123456 </td>
+                                                        <td> WH B </td>
+                                                        <td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> 03-07-2017 </td>
                                                         <td> 03-07-2017 </td>
@@ -539,12 +539,12 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             </div><br/></center>
                                                         </td>
                                                         <td> 123456 </td>
-                                                        <td> 123456 </td>
                                                         <td> CIEF/0005 </td>
-                                                        <td> 123456 </td>
                                                         <td> <center>8,000.00 (MYR)</center> </td>
                                                         <td> CTN54 </td>
                                                         <td> 123456 </td>
+                                                        <td> WH C </td>
+                                                        <td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> 03-07-2017 </td>
                                                         <td> <span style="color:red"><strong>15-07-2017<br/>Delayed</strong></span> </td>
@@ -560,12 +560,12 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             </div><br/></center>
                                                         </td>
                                                         <td> 123456 </td>
-                                                        <td> 123456 </td>
                                                         <td> CIEF/0004 </td>
-                                                        <td> 123456 </td>
                                                         <td> <center>5,000.00 (HKD)</center> </td>
                                                         <td> CTN53 </td>
                                                         <td> 123456 </td>
+                                                        <td> WH D </td>
+                                                        <td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> <span style="color:red"><strong>28-06-2017<br/>Delayed</strong> </span> </td>
                                                         <td> 03-07-2017 </td>
@@ -578,17 +578,17 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td><center>
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00001<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat </a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
-                                                            </div><br/></center> </td>
-														<td> 123456 </td>														
+                                                            </div><br/></center> </td>													
                                                         <td> 123456 </td>
                                                         <td> CIEF/0003 </td>
-                                                        <td> 123456 </td>
                                                         <td> <center>4,000.00 (USD)</center> </td>
                                                         <td> N/A </td>
                                                         <td> N/A </td>
                                                         <td> N/A </td>
                                                         <td> N/A </td>
                                                         <td> N/A </td>
+                                                        <td> N/A </td>
+                                                        <td> N/A </td>
                                                     </tr>                                                    
                                                 </tbody>
                                             </table>
diff --git a/public/Forwarder/notice.html b/public/Forwarder/notice.html
index 40ea1ca..9aaa017 100644
--- a/public/Forwarder/notice.html
+++ b/public/Forwarder/notice.html
@@ -304,6 +304,7 @@ License: You must have a valid license purchased only from themeforest(the above
                             <label class="control-label" for="title">Title</label>
                             <input id="title" type="text" class="form-control" value="" placeholder="Enter a title...">
                         </div>
+                        
                         <div class="form-group">
                             <label class="control-label" for="message">Message</label>
                             <textarea class="form-control" id="message" rows="3" placeholder="Enter a message..."></textarea>
diff --git a/public/Forwarder/profile.html b/public/Forwarder/profile.html
index 3bae763..8b39b3a 100644
--- a/public/Forwarder/profile.html
+++ b/public/Forwarder/profile.html
@@ -21,7 +21,7 @@ License: You must have a valid license purchased only from themeforest(the above
 
     <head>
         <meta charset="utf-8" />
-        <title>IZYIM | Profile Settings</title>
+        <title>IZYIM | Account Settings</title>
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta content="width=device-width, initial-scale=1" name="viewport" />
         <meta content="Preview page of Metronic Admin Theme #1 for statistics, charts, recent events and reports" name="description" />
@@ -297,7 +297,7 @@ License: You must have a valid license purchased only from themeforest(the above
                         </div>
                         <!-- END PAGE BAR -->
                         <!-- BEGIN PAGE TITLE-->
-                        <h1 class="page-title"> Profile Settings
+                        <h1 class="page-title"> Account Settings
                         </h1>
 						
 						<!-- CONTENT -->
@@ -323,7 +323,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <ul class="nav">
                                                 <li class="active">
                                                     <a href="profile.html">
-                                                        <i class="icon-settings"></i> Personal Settings </a>
+                                                        <i class="icon-settings"></i> Account Settings </a>
                                                 </li>
                                                 <li>
                                                     <a href="team.html">
@@ -382,12 +382,12 @@ License: You must have a valid license purchased only from themeforest(the above
 																	</div>
 																	</div>
 																</div>
-                                                                <div class="form-group">
+                                                                <!--<div class="form-group">
                                                                     <label class="control-label">Interests</label>
-                                                                    <input type="text" placeholder="Design, Web etc." class="form-control" /> </div>
+                                                                    <input type="text" placeholder="Design, Web etc." class="form-control" /> </div>-->
                                                                 <div class="form-group">
-                                                                    <label class="control-label">Occupation</label>
-                                                                    <input type="text" placeholder="Web Developer" class="form-control" /> </div>
+                                                                    <label class="control-label">Position</label>
+                                                                    <input type="text" placeholder="Sales, Marketing, CEO" class="form-control" /> </div>
                                                                 <div class="form-group">
                                                                     <label class="control-label">Website Url</label>
                                                                     <input type="text" placeholder="http://www.mywebsite.com" class="form-control" /> </div>
diff --git a/public/Forwarder/profile2.html b/public/Forwarder/profile2.html
index b8d865b..424ba08 100644
--- a/public/Forwarder/profile2.html
+++ b/public/Forwarder/profile2.html
@@ -390,15 +390,15 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 </div> 
                                                                 </tr>
                                                                 <tr>
-                                                                <div class="form-group">
+                                                                <!--<div class="form-group">
                                                                     <td><label class="control-label">Interests</label></td>
                                                                     <td><label class="control-label">: Design</label></td>
-                                                                </div>
+                                                                </div>-->
                                                                 </tr>
                                                                 <tr>
                                                                 <div class="form-group">
-                                                                    <td><label class="control-label">Occupation</label></td>
-                                                                    <td><label class="control-label">: Forwarder</label></td>
+                                                                    <td><label class="control-label">Position</label></td>
+                                                                    <td><label class="control-label">: Sales</label></td>
                                                                 </div>  
                                                                 </tr>
                                                                 </table>
diff --git a/public/Forwarder/warehousenote.html b/public/Forwarder/warehousenote.html
index 6076fb8..7295316 100644
--- a/public/Forwarder/warehousenote.html
+++ b/public/Forwarder/warehousenote.html
@@ -561,7 +561,7 @@
                                                                         <!--/span-->
                                                                         <div class="col-md-6">
                                                                             <div class="form-group">
-                                                                                <label class="control-label col-md-3" style="font-size: 100%">Warehouse Receive Note No</label>
+                                                                                <label class="control-label col-md-3" style="margin-top: 1px; font-size: 100%">Warehouse Receive Note No</label>
                                                                                 <div class="col-md-9">
                                                                                     <input type="text" class="form-control">
                                                                                 </div>
@@ -570,6 +570,7 @@
                                                                     </div>
                                                                     <!--/span-->
                                                                 </div>
+
                                                                 <div class="row">
                                                                     <div class="col-md-6">
                                                                         <div class="form-group">
@@ -588,38 +589,60 @@
                                                                             </div>
                                                                         </div>
                                                                     </div>
+                                                                    </div>
                                                                     <br>
                                                                     <br>
                                                                     <!--/span-->
-                                                                    <!--/span-->
-                                                                    
-
-                                                                    <div class="column">
-
+                                                                    <div class="row">
+                                                                                      <!--/span-->
                                                                     <div class="col-md-6">
                                                                         <div class="form-group">
-                                                                            <label class="control-label col-md-3" style="font-size: 98%">Transport<br> Company Name</label>
+                                                                            <label class="control-label col-md-3" style="font-size: 100%">Transport<br>Company Name</label>
                                                                             <div class="col-md-9">
-                                                                                <input type="text" class="form-control">
+                                                                                <input placeholder="Syed Amir" type="text" class="form-control">
                                                                             </div>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-6">
-                                                                        <div class="form-group" style="margin-left:33px">
-                                                                            <label class="control-label col-md-2" style="font-size: 100%">Remark</label>
-                                                                            <div class="col-md-10">
-                                                                                <input type="text" class="form-control">
-                                                                            </div>
-                                                                        </div>
                                                                     </div>
-                                                                    <button type="button" class="btn green" id="Sumbit" href="" style=" margin-top:-30px;margin-left: 630px" data-toggle="modal">+ Add New Field</button>
-                       
+                                                                    <!--/span-->
+                                                                     <div class="row">
+                                                                   
+                                                                    <!--/span-->
+                                                <div style="margin-right:450px" class="form-group">
+                                                <label  class="col-md-3 control-label">Remark</label>
+                                                <div class="col-md-9">
+                                                     <div class="mt-repeater">
+                                                        <div data-repeater-list="group-b">
+                                                            <div data-repeater-item class="row">
+                                                                <div class="col-md-9">
+                                                                    <label class="control-label">Additional Remark</label>
+                                                                    <input type="textarea" placeholder="Type a remark" class="form-control" /> </div>
+                                                               <div class="col-md-1">
+                                                                    <label class="control-label">&nbsp;</label>
+                                                                    <a href="javascript:;" data-repeater-delete class="btn btn-danger">
+                                                                        <i class="fa fa-close"></i>
+                                                                    </a>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <hr>
+                                                        <a href="javascript:;" data-repeater-create class="btn btn-info mt-repeater-add">
+                                                            <i class="fa fa-plus"></i> Add New Field</a>
+                                                        <br>
+                                                        <br> 
+                                                </div>
+                                            </div>
+                                            </div>
+                                            
                                                                     </div>
-                                                                            
+                                                                            <br>
+                                                                            <br>
+                                                                            <br>
+                                                
+                                                
+                                            
+
                                                 
-                                                                            <br>
-                                                                            <br>
-                                                                            <br>
                                                                             <div class="form-actions">
                                                                                 <div class="col-md-20">
                                                                                     <a href="javascript:;" class="btn btn-outline green button-next" style="margin-left:450px"> Next</a>
@@ -635,7 +658,7 @@
                                     </form>-->
                                                                     
                                                                 </div>
-                                                            </div>
+                                                           
                                                             <div class="tab-pane" id="tab2">
                                                                 <div class="col-md-13">
                                                                     <div class="portlet light bordered">
@@ -1086,9 +1109,12 @@
                     <script src="../assets/global/plugins/bootstrap-editable/inputs-ext/wysihtml5/wysihtml5.js" type="text/javascript"></script>
                     <script src="../assets/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js" type="text/javascript"></script>
                     <script src="../assets/pages/scripts/form-editable.js" type="text/javascript"></script>
-                    <script src="../assets/pages/scripts/form-repeater.js" type="text/javascript"></script>
+                   
                     <script src="../assets/pages/scripts/form-repeater.min.js" type="text/javascript"></script>
+                     <script src="../assets/pages/scripts/components-date-time-pickers.min.js" type="text/javascript"></script>
                     <script src="../assets/pages/scripts/table-datatables-managed.min.js" type="text/javascript"></script>
+                    <script src="../assets/global/plugins/jquery-repeater/jquery.repeater.js" type="text/javascript"></script>
+                    <script src="../assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
                     
                     
                     
@@ -1106,12 +1132,12 @@
 
 
                             var dataSet = [
-                                ["01-08-2017", "ABC Warehouse", "101", "CIEF/00012/00012", "00012", "CBD SDN BHD", "00012-00012", "4", " Pallet", "12 CBM", "10kg", "", "<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></div><br/></center></td>"],
-                                ["04-08-2017", "ABC Warehouse", "102", "CIEF/00022/00022", "00022", "CBD SDN BHD", "00022-00022", "5", " Package", "13 CBM", "17kg", "", "<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></div><br/></center></td>"],
-                                ["11-08-2017", "ABC Warehouse", "103", "CIEF/00034/00034", "00034", "CBD SDN BHD", "00034-00034", "8", " Pallet", "23 CBM", "84kg", "", "<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></div><br/></center></td>"],
-                                ["31-08-2017", "ABC Warehouse", "104", "CIEF/00089/00089", "00089", "CBD SDN BHD", "00089-00089", "10", " Package", "54 CBM", "100kg", "", "<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></div><br/></center></td>"],
-                                ["01-09-2017", "ABC Warehouse", "105", "CIEF/00100/00100", "00100", "CBD SDN BHD", "00100-00100", "3", " Pallet", "10 CBM", "30kg", "", "<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></div><br/></center></td>"],
-                                ["17-09-2017", "ABC Warehouse", "106", "CIEF/00156/00156", "00156", "CBD SDN BHD", "00156-00156", "4", " Package", "24 CBM", "20kg", "", "<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></div><br/></center></td>"],
+                                ["01-08-2017", "ABC Warehouse", "101", "CIEF/00012/00012", "00012", "CBD SDN BHD", "00012-00012", "4", " Pallet", "12 CBM", "10kg", "", "<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='#'> Delete </a></li></ul></div><br/></center></td>"],
+                                ["04-08-2017", "ABC Warehouse", "102", "CIEF/00022/00022", "00022", "CBD SDN BHD", "00022-00022", "5", " Package", "13 CBM", "17kg", "", "<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='#'> Delete  </a></li></ul></div><br/></center></td>"],
+                                ["11-08-2017", "ABC Warehouse", "103", "CIEF/00034/00034", "00034", "CBD SDN BHD", "00034-00034", "8", " Pallet", "23 CBM", "84kg", "", "<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='#'> Delete  </a></li></ul></div><br/></center></td>"],
+                                ["31-08-2017", "ABC Warehouse", "104", "CIEF/00089/00089", "00089", "CBD SDN BHD", "00089-00089", "10", " Package", "54 CBM", "100kg", "", "<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='#'> Delete  </a></li></ul></div><br/></center></td>"],
+                                ["01-09-2017", "ABC Warehouse", "105", "CIEF/00100/00100", "00100", "CBD SDN BHD", "00100-00100", "3", " Pallet", "10 CBM", "30kg", "", "<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='#'> Delete  </a></li></ul></div><br/></center></td>"],
+                                ["17-09-2017", "ABC Warehouse", "106", "CIEF/00156/00156", "00156", "CBD SDN BHD", "00156-00156", "4", " Package", "24 CBM", "20kg", "", "<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='#'> Delete  </a></li></ul></div><br/></center></td>"],
                                 // ["7","<a  style='float:center' data-toggle='modal' href='#profile'> CTN133 </a>","789ABC","01-08-2017","<span style='color:red'>02-08-2017 </span>","<span style='color:red'>04-08-2017 </span>","68679","Guangzhou","Customs Examination","03-07-2017","<span style='color:red'><strong>03-07-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
                                 // ["8","<a  style='float:center' data-toggle='modal' href='#profile'> CTN135 </a>","789ABC","01-08-2017","<span style='color:red'>01-08-2017 </span>","<span style='color:red'>05-08-2017 </span>","12345","Dongguan","Customs Examination","03-07-2017","<span style='color:red'><strong>03-07-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
                             ];
@@ -1215,7 +1241,7 @@
                                 ],
 
                                 initComplete: function() {
-                                    configFilter(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+                                    configFilter(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
                                 }
                             });
 
diff --git a/public/Importer/index.html b/public/Importer/index.html
index 9765db2..79d9028 100644
--- a/public/Importer/index.html
+++ b/public/Importer/index.html
@@ -358,13 +358,13 @@ License: You must have a valid license purchased only from themeforest(the above
 															  <li><input onchange="filterme()" name="orderno" value="00005" type="checkbox"/>&nbsp;00005</li>															  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Order Number"> PO<br/> No </a> <br/>
+														<!--<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Order Number"> PO<br/> No </a> <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="shipno" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul> 
-														</th>
+														</th>-->
 														<th width="1%"> Supplier<br/> Code <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>
@@ -372,21 +372,21 @@ License: You must have a valid license purchased only from themeforest(the above
 															  <li><input onchange="filterme()" name="suppliercode" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Customer Code"> Cust<br/> Code </a> <br/>
+														<th width="1%"> Marking <br/>
 															<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
 															<span class="fa fa-filter"></span></button>
 															<ul class="dropdown-menu">
 															  <li><input onchange="filterme()" name="custcode" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Agent Code"> Agent<br/> Code </a> <br/>
+														<th width="1%"> Forwarder <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="custcode" value="123456" type="checkbox"/>&nbsp;123456</li>														  
 															</ul>
 														</th>
-														<th width="1%"> <a href="javascript:;" class="tooltips" data-placement="bottom" data-original-title="Purchase Value"> Purchase<br/> Val </a> <br/>
+														<th width="1%">  Purchase<br/> Value <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">
@@ -442,7 +442,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00005<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 5 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-                                                        <td> 123456 </td>
 														<td> 123456 </td>
                                                         <td> CIEF/0008 </td>
                                                         <td> 123456 </td>
@@ -463,7 +462,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00004<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat <span class='badge badge-warning'> 10 </span></a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
                                                             </div><br/></center>
                                                         </td>
-														<td> 123456 </td>
                                                         <td> 123456 </td>
                                                         <td> CIEF/0007 </td>
                                                         <td> 123456 </td>
@@ -485,7 +483,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             </div><br/></center>
                                                         </td>
                                                         <td> 123456 </td>
-                                                        <td> 123456 </td>
                                                         <td> CIEF/0005 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>8,000.00 (MYR)</center> </td>
@@ -506,7 +503,6 @@ License: You must have a valid license purchased only from themeforest(the above
                                                             </div><br/></center>
                                                         </td>
                                                         <td> 123456 </td>
-                                                        <td> 123456 </td>
                                                         <td> CIEF/0004 </td>
                                                         <td> 123456 </td>
                                                         <td> <center>5,000.00 (HKD)</center> </td>
@@ -524,8 +520,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td><center>
                                                             <div class='btn-group'>
                                                             <button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>00001<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href="chat.html"> Chat </a></li><li><a href='orderdetails.html'> Details </a></li><li class='divider'> </li><li><a href='javascript:;'> Cancel</a></li></ul>
-                                                            </div><br/></center> </td>
-														<td> 123456 </td>														
+                                                            </div><br/></center> </td>										
                                                         <td> 123456 </td>
                                                         <td> CIEF/0003 </td>
                                                         <td> 123456 </td>
diff --git a/public/Importer/profile.html b/public/Importer/profile.html
index 96e10b9..4ebd6cd 100644
--- a/public/Importer/profile.html
+++ b/public/Importer/profile.html
@@ -269,7 +269,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <ul class="nav">
                                                 <li class="active">
                                                     <a href="profile.html">
-                                                        <i class="icon-settings"></i> Personal Settings </a>
+                                                        <i class="icon-settings"></i> Profile Settings </a>
                                                 </li>
                                                 <li>
                                                     <a href="team.html">
@@ -328,12 +328,12 @@ License: You must have a valid license purchased only from themeforest(the above
 																	</div>
 																	</div>
 																</div>
-                                                                <div class="form-group">
+                                                                <!--<div class="form-group">
                                                                     <label class="control-label">Interests</label>
-                                                                    <input type="text" placeholder="Design, Web etc." class="form-control" /> </div>
+                                                                    <input type="text" placeholder="Design, Web etc." class="form-control" /> </div>-->
                                                                 <div class="form-group">
-                                                                    <label class="control-label">Occupation</label>
-                                                                    <input type="text" placeholder="Web Developer" class="form-control" /> </div>
+                                                                    <label class="control-label">Position</label>
+                                                                    <input type="text" placeholder="Sales, Marketing, CEO" class="form-control" /> </div>
                                                                 <div class="form-group">
                                                                     <label class="control-label">Website Url</label>
                                                                     <input type="text" placeholder="http://www.mywebsite.com" class="form-control" /> </div>
diff --git a/public/Importer/profile2.html b/public/Importer/profile2.html
index 42b40b4..8a27ed7 100644
--- a/public/Importer/profile2.html
+++ b/public/Importer/profile2.html
@@ -341,15 +341,15 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                 </div> 
                                                                 </tr>
                                                                 <tr>
-                                                                <div class="form-group">
+                                                                <!--<div class="form-group">
                                                                     <td><label class="control-label">Interests</label></td>
                                                                     <td><label class="control-label">: Design</label></td>
-                                                                </div>
+                                                                </div>-->
                                                                 </tr>
                                                                 <tr>
                                                                 <div class="form-group">
-                                                                    <td><label class="control-label">Occupation</label></td>
-                                                                    <td><label class="control-label">: Forwarder</label></td>
+                                                                    <td><label class="control-label">Position</label></td>
+                                                                    <td><label class="control-label">: Sales</label></td>
                                                                 </div>  
                                                                 </tr>
                                                                 </table>
diff --git a/public/Importer/purchaseorder2.html b/public/Importer/purchaseorder2.html
index 96c5c82..b70ec28 100644
--- a/public/Importer/purchaseorder2.html
+++ b/public/Importer/purchaseorder2.html
@@ -442,11 +442,30 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="input-group-btn">
-		                                                    <button type="button" class="btn green">
-		                                                        <i class="icon-plus">Add New Input</i>
-		                                                    </button>
-		                                               		</div>
+                                                <div class="row">
+                                                <div class="col-md-8">
+                                                    <div class="mt-repeater">
+                                                        <div data-repeater-list="group-b">
+                                                            <div data-repeater-item class="row">
+                                                                <div class="col-md-3">
+                                                                    <input type="text" placeholder="Form Name" class="form-control" /> </div>
+                                                                <div class="col-md-8">
+                                                                    <input type="text" placeholder="Form Name" class="form-control" /> </div>
+                                                                <div class="col-md-1">
+                                                                    <label class="control-label">&nbsp;</label>
+                                                                    <a href="javascript:;" data-repeater-delete class="btn btn-danger">
+                                                                        <i class="fa fa-close"></i>
+                                                                    </a>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <hr>
+                                                        <a href="javascript:;" data-repeater-create class="btn btn-info mt-repeater-add">
+                                                            <i class="fa fa-plus"></i> Add New Input</a>
+                                                        <br>
+                                                        <br> </div>
+                                                </div>
+                                            </div>
                                                             <div class="form-actions">
                                                             <div class="row">
                                                                 <div class="col-md-offset-5 col-md-9">
@@ -653,6 +672,8 @@
         <!-- END PAGE LEVEL PLUGINS -->
         <!-- BEGIN THEME GLOBAL SCRIPTS -->
         <script src="../assets/global/scripts/app.min.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/jquery-repeater/jquery.repeater.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
         <!-- END THEME GLOBAL SCRIPTS -->
         <!-- BEGIN PAGE LEVEL SCRIPTS -->
 		<script src="../assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
@@ -664,6 +685,8 @@
         <script src="../assets/pages/scripts/form-wizard.min.js" type="text/javascript"></script>
         <script src="../assets/pages/scripts/table-datatables-editable.min.js" type="text/javascript"></script>
         <!-- END PAGE LEVEL SCRIPTS -->
+        <script src="../assets/pages/scripts/form-repeater.min.js" type="text/javascript"></script>
+        <script src="../assets/pages/scripts/components-date-time-pickers.min.js" type="text/javascript"></script>
         
         <!-- END PAGE LEVEL SCRIPTS -->
         <!-- BEGIN THEME LAYOUT SCRIPTS -->
@@ -717,6 +740,9 @@ $('#make-it-slick').on('click', function(){
 $('#restore').on('click', function(){
     $('#demo-htmlselect').ddslick('destroy');
 });
+
+
+
         </script>
         
     </body>
diff --git a/public/assets/global/plugins/font-awesome/font-awesome.zip b/public/assets/global/plugins/font-awesome/font-awesome.zip
new file mode 100644
index 0000000..a3bfb5d
Binary files /dev/null and b/public/assets/global/plugins/font-awesome/font-awesome.zip differ
diff --git a/public/assets/pages/scripts/form-repeater.min.js b/public/assets/pages/scripts/form-repeater.min.js
index b061476..e834c0a 100644
--- a/public/assets/pages/scripts/form-repeater.min.js
+++ b/public/assets/pages/scripts/form-repeater.min.js
@@ -1 +1 @@
-var FormRepeater=function(){return{init:function(){$(".mt-repeater").each(function(){$(this).repeater({show:function(){$(this).slideDown(),$(".date-picker").datepicker({rtl:App.isRTL(),orientation:"left",autoclose:!0})},hide:function(e){confirm("Are you sure you want to delete this element?")&&$(this).slideUp(e)},ready:function(e){}})})}}}();jQuery(document).ready(function(){FormRepeater.init()});
\ No newline at end of file
+var FormRepeater=function(){return{init:function(){$(".mt-repeater").each(function(){$(this).repeater({show:function(){$(this).slideDown(),$(".date-picker").datepicker({rtl:App.isRTL(),orientation:"left",autoclose:!0})},hide:function(e){confirm("Are you sure you want to delete this element?")&&$(this).slideUp(e)},ready:function(e){}})})}}}();jQuery(document).ready(function(){FormRepeater.init()});