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/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/Importer/index.html b/public/Importer/index.html
index 13cb0d4..dbd6f46 100644
--- a/public/Importer/index.html
+++ b/public/Importer/index.html
@@ -364,13 +364,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>
@@ -378,21 +378,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">
@@ -448,7 +448,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>
@@ -469,7 +468,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>
@@ -491,7 +489,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>
@@ -512,7 +509,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>
@@ -530,8 +526,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 692930c..0e3a59f 100644
--- a/public/Importer/profile.html
+++ b/public/Importer/profile.html
@@ -274,7 +274,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">
@@ -333,12 +333,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/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