diff --git a/Forwarder/chat.html b/Forwarder/chat.html
index fc53929..19e14ca 100644
--- a/Forwarder/chat.html
+++ b/Forwarder/chat.html
@@ -175,54 +175,42 @@
                            </center>
                         </li>
                         <hr>
-                        <li class="nav-item start">
+                        <li class="nav-item start ">
                                 <a href="index.html" class="nav-link nav-toggle">
                                     <i class="icon-home"></i>
                                     <span class="title">Order Status</span>
                                     <span class="selected"></span>
                                 </a>
                             </li>
-							<li class="nav-item active open">
-								<a href="chat.html" class="nav-link nav-toggle">
-									<i class="fa fa-comments-o"></i>
-									<span class="title">Messenger</span>
-									<span class="selected"></span>
-								</a>
-							</li>
-							<li class="nav-item">
-								<a href="trackorder.html" class="nav-link nav-toggle">
-									<i class="icon-basket"></i>
-									<span class="title">Track Order</span>
-									<span class="selected"></span>
-								</a>
-							</li>
-							<li class="nav-item  ">
-								<a href="javascript:;" class="nav-link nav-toggle">
-									<i class="icon-basket"></i>
-									<span class="title">Orders</span>
-									<span class="arrow"></span>
-								</a>
-								<ul class="sub-menu">
-									<li class="nav-item  ">
-										<a href="purchaseorder.html" class="nav-link ">
-											<i class="icon-clock"></i>
-											<span class="title">Purchase Order</span>
-										</a>
-									</li>
-									<li class="nav-item  ">
-										<a href="shippingorder.html" class="nav-link ">
-											<i class="icon-check"></i>
-											<span class="title">Shipping Order</span>
-										</a>
-									</li>
-									<li class="nav-item  ">
-										<a href="opendraft.html" class="nav-link ">
-											<i class="icon-envelope"></i>
-											<span class="title">Open Draft</span>
-										</a>
-									</li>
-								</ul>
-							</li>
+                            <li class="nav-item">
+                                <a href="notice.html" class="nav-link nav-toggle">
+                                    <i class="fa fa-newspaper-o"></i>
+                                    <span class="title">Notice</span>
+                                    <span class="selected"></span>
+                                </a>
+                            </li>
+                            
+                            <li class="nav-item">
+                                <a href="deliveryarrange.html" class="nav-link nav-toggle">
+                                    <i class="fa fa-briefcase"></i>
+                                    <span class="title">Delivery Arrangement</span>
+                                    <span class="selected"></span>
+                                </a>
+                            </li>
+						<li class="nav-item  active open">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
+								<i class="fa fa-comments-o"></i>
+								<span class="title">Messenger</span>
+								<span class="selected"></span>
+							</a>
+						</li>
+                        <li class="nav-item">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
+                                <i class="icon-basket"></i>
+                                <span class="title">Track Order</span>
+                                <span class="selected"></span>
+                            </a>
+                        </li>
 							<li class="nav-item ">
                                 <a href="profile.html" class="nav-link nav-toggle">
                                     <i class="icon-user"></i>
@@ -235,6 +223,27 @@
                                     <span class="title">Contact List</span>
                                 </a>
                             </li>
+                            <li class="nav-item">
+                                <a href="javascript:;" class="nav-link nav-toggle">
+                                    <i class="icon-settings"></i>
+                                    <span class="title">Settings</span>
+                                    <span class="arrow"></span>
+                                </a>
+                                <ul class="sub-menu">
+                                    <li class="nav-item  ">
+                                        <a href="formcustomize.html" class="nav-link ">
+                                            <i class="icon-clock"></i>
+                                            <span class="title">Form Customization</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="updatecurrency.html" class="nav-link ">
+                                            <i class="icon-check"></i>
+                                            <span class="title">Update Currency</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                            </li>
                      </ul>
                      <!-- END SIDEBAR MENU -->
                      <!-- END SIDEBAR MENU -->
@@ -274,7 +283,7 @@
                                                 <div class="inputs">
                                                    <div class="row">
                                                       <div class="col-md-12">
-                                                         <div class="col-md-7">
+                                                         <div class="col-md-9">
                                                             <div class="portlet-input input-inline input-small" style="margin-bottom:10px">
                                                                <div class="input-icon right">
                                                                   <i class="icon-magnifier"></i>
@@ -282,7 +291,7 @@
                                                                </div>
                                                             </div>
                                                          </div>
-                                                         <div class="col-md-2">
+                                                         <div class="col-md-3">
                                                             <div class="btn-group" style="width:100%">
                                                                <a href="" class="btn btn-circle btn-icon-only btn-default" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
                                                                <span class="fa fa-filter"></span>
@@ -311,14 +320,6 @@
                                                                </ul>
                                                             </div>
                                                          </div>
-                                                          <div class="col-md-2">
-                                                            <div class="btn-group" style="width:100%">
-                                                               <a href="" class="btn btn-circle btn-icon-only btn-default" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
-                                                               <span class="fa fa-bell"></span> 
-                                                                </a>
-                                                            </div>
-                                                        </div>
-                                                          <span style="position: relative;" class="badge badge-danger">1</span>
                                                       </div>
                                                    </div>
                                                 </div>
@@ -326,9 +327,9 @@
                                              <div class="portlet-body">
                                                 <div id="tree_1" class="tree-demo">
                                                    <ul>
-                                                       <li>
+                                                       <li onclick="show_general();">
                                                          General
-                                                      </li>
+														</li>
                                                       <li>
                                                          CIEF
                                                          <ul>
@@ -361,8 +362,8 @@
                                              </div>
                                              <div class="portlet-body">
                                                 <div class="row">
-                                                        <div class="col-md-6">
-                                                            <img src="../assets/global/img/folderimg.ico" alt="Image" style="width:150px;height:150px;" data-toggle="modal" href="#doc">
+                                                        <div class="col-md-12" style="text-align:center;">
+                                                            <img src="../assets/global/img/folderimg.ico" alt="Image" style="width:100px;height:100px;" data-toggle="modal" href="#doc">
                                                         </div>
                                                  </div>
                                              </div>
@@ -370,7 +371,7 @@
                                        </div>
                                     </div>
                                  </div>
-                                 <div class="col-md-9"  id="with_content" >
+                                 <div class="col-md-9" id="with_content">
                                     <div class="row">
                                        <div class="col-md-12">
                                           <div class="portlet light portlet-fit full-height-content full-height-content-scrollable bordered">
@@ -382,8 +383,6 @@
                                                 <div class="actions">
                                                    <a class="btn btn-circle btn-default" style="margin-left: 15px;" data-toggle="modal" href="#chat">
                                                    <i class="fa fa-plus"></i> Add Group </a>
-                                                   <a class="btn btn-circle btn-default" style="margin-left: 15px;" data-toggle="modal" href="#doc">
-                                                   <i class="fa fa-plus"></i> Upload </a>
                                                    <a href="javascript:window.open('trackorder2.html', 'Track Order', 'width=1000,height=600');" class="btn btn-circle btn-default tooltips" data-placement="bottom" data-original-title="Track Order">
                                                    <i class="fa fa-map-marker" aria-hidden="true"></i> Track Order
                                                    </a>
@@ -529,7 +528,94 @@
 										   </div>
 									 </div>
 								 </div>
-                              </div>
+ 								 <div class="col-lg-9" id="general_content" style="display:none;" >
+									<div class="portlet light bordered">
+										<div class="portlet-title">
+											<div class="caption">
+												<i class="icon-share font-dark hide"></i>
+												<span class="caption-subject font-dark bold uppercase">General Notifications</span>
+											</div>
+											<div class="actions">
+												<div class="btn-group">
+													<a class="btn btn-sm blue btn-outline btn-circle" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true"> Filter By
+														<i class="fa fa-angle-down"></i>
+													</a>
+													<div class="dropdown-menu hold-on-click dropdown-checkboxes pull-right">
+														<label class="mt-checkbox mt-checkbox-outline">
+															<input type="checkbox" /> 
+															<span></span>
+														</label>
+														<label class="mt-checkbox mt-checkbox-outline">
+															<input type="checkbox" /> Currency Update
+															<span></span>
+														</label>
+													</div>
+												</div>
+											</div>
+										</div>
+										<div class="portlet-body">
+											<div class="scroller" style="height: 300px;" data-always-visible="1" data-rail-visible="0">
+												<ul class="feeds">
+													<li>
+														<div class="col1">
+															<div class="cont">
+																<div class="cont-col1">
+																	<div class="label label-sm label-info">
+																		<i class="fa fa-money"></i>
+																	</div>
+																</div>
+																<div class="cont-col2">
+																	<div class="desc"> CIEF updated their currency on <strong>05/08/2017 13:12</strong> for <strong>MYR</strong> currency. The new rate are <strong>Buy 1.6</strong> and <strong>Sell 1.605</strong>.</div>
+																</div>
+															</div>
+														</div>
+														<div class="col2">
+															<div class="date"> Just now </div>
+														</div>
+													</li>
+													<li>
+														<a href="javascript:;">
+															<div class="col1">
+																<div class="cont">
+																	<div class="cont-col1">
+																		<div class="label label-sm label-success">
+																			<i class="fa fa-money"></i>
+																		</div>
+																	</div>
+																	<div class="cont-col2">
+																		<div class="desc"> ABC updated their currency on <strong>05/08/2017 12:52</strong> for <strong>USD</strong> currency. The new rate are <strong>Buy 1.59</strong> and <strong>Sell 1.60</strong>.</div>
+																	</div>
+																</div>
+															</div>
+															<div class="col2">
+																<div class="date"> 20 mins </div>
+															</div>
+														</a>
+													</li>
+													<li>
+														<div class="col1">
+															<div class="cont">
+																<div class="cont-col1">
+																	<div class="label label-sm label-danger">
+																		<i class="fa fa-money"></i>
+																	</div>
+																</div>
+																<div class="cont-col2">
+																	<div class="desc"> ABC updated their currency on <strong>05/08/2017 13:48</strong> for <strong>HKD</strong> currency. The new rate are <strong>Buy 1.59</strong> and <strong>Sell 1.60</strong>.</div>
+																</div>
+															</div>
+														</div>
+														<div class="col2">
+															<div class="date"> 24 mins </div>
+														</div>
+													</li>
+												</ul>
+											</div>
+										</div>
+									</div>
+								</div>
+								
+							 </div>
                            </div>
                         </div>
                      </div>
@@ -766,6 +852,46 @@
                         </div>
                     </div>
                 <!-- Modal -->
+				<div class="modal fade in" id="move" tabindex="-1" role="basic" aria-hidden="true" style="z-index:999999;">
+							<div class="modal-dialog">
+								<div class="modal-content">
+									<div class="modal-header">
+										<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+										
+										<div class="caption">
+                                            <i class="fa fa-gift"></i>Move File
+										</div>
+									</div>
+									<div class="modal-body"> 
+										<div class="form">
+											<div class="row">
+												<div class="col-md-12">
+													<div class="form-group">
+														<label>Folder</label>
+														<select id="folder" class="form-control"  onchange="show_hide(this);">
+															<option>Select / Create New Folder</option>
+															<option value="doc">Documents</option>
+															<option value="img">Images</option>
+															<option value="sound">Sounds</option>
+															<option value="oth">Others</option>
+															<option value="create">Create New</option>
+														</select>
+													</div>
+													<div class="form-group" id="folder_name" style="display: none">
+														<label>Folder Name</label>
+														<input type="text" class="form-control">
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+									<div class="modal-footer">
+										<button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
+										<button type="button" class="btn green" data-dismiss="modal">Move</button>
+									</div>
+								</div>
+							</div>
+						</div>
     <div class="modal fade" id="doc" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
@@ -807,6 +933,9 @@
                             <button class="btn btn-default">
                                 <span class="glyphicon glyphicon-refresh"></span>
                             </button>
+                            <a class="btn btn-default" href='#move' data-toggle='modal'>
+                                <span class="glyphicon glyphicon-move"></span>
+                            </a>
                                 <div class="btn-group">
                                 <button id="list"  type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span>
                                 </button>
@@ -868,10 +997,11 @@
 							</div>
 						</div>
 						<div class="col-md-9" id="lists" style="display:none;">
-                            <table class="table table-hover" style="height:300px"> 
+                            <table class="table table-hover" id="example2" style="height:300px"> 
                             
                                     <thead> 
                                     <tr>
+                                    <th><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='group-checkable' data-set='#example2 .checkboxes' /><span></span></label></th>
                                     <th>ID</th>
                                     <th>Date</th>
                                     <th>Title</th>
@@ -880,28 +1010,32 @@
                                     </thead>
                                     <tbody>
                                     <tr>
+                                    <td><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label</td>
                                     <td>1</td>
                                     <td>2017-08-02 13:45:22</td>
                                     <td><a href="https://unsplash.it/1200/768.jpg?image=251" data-toggle="lightbox" data-gallery="example-gallery" class="col-sm-4">Container</a></td>
-                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a></td>
+                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a><a href="#" class="btn btn-xs"><span class="glyphicon glyphicon-download-alt"></span></a></td>
                                     </tr>
                                     <tr>
+                                    <td><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label</td>
                                     <td>2</td>
                                     <td>2017-08-02 13:45:22</td>
                                     <td><a href="https://unsplash.it/1200/768.jpg?image=251" data-toggle="lightbox" data-gallery="example-gallery" class="col-sm-4">Container</a></td>
-                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a></td>
+                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a><a href="#" class="btn btn-xs"><span class="glyphicon glyphicon-download-alt"></span></a></td>
                                     </tr>
                                     <tr>
+                                    <td><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label</td>
                                     <td>3</td>
                                     <td>2017-08-02 13:45:22</td>
                                     <td><a href="https://unsplash.it/1200/768.jpg?image=251" data-toggle="lightbox" data-gallery="example-gallery" class="col-sm-4">Container</a></td>
-                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a></td>
+                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a><a href="#" class="btn btn-xs"><span class="glyphicon glyphicon-download-alt"></span></a></td>
                                     </tr>
                                     <tr>
+                                    <td><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input type='checkbox' class='checkboxes' value='1' /><span></span></label</td>
                                     <td>4</td>
                                     <td>2017-08-02 13:45:22</td>
                                     <td><a href="https://unsplash.it/1200/768.jpg?image=251" data-toggle="lightbox" data-gallery="example-gallery" class="col-sm-4">Container</a></td>
-                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a></td>
+                                    <td class="text-center"><a href="#" onclick="confirm('Are you confirm to delete this file?')" class="btn btn-xs"><span class="glyphicon glyphicon-trash"></span></a><a href="#" class="btn btn-xs"><span class="glyphicon glyphicon-download-alt"></span></a></td>
                                     </tr>
                                     
                                    
@@ -1053,12 +1187,14 @@
 						//alert('heiiiii');
 						document.getElementById("without_content").style.display = "";
 						document.getElementById("with_content").style.display = "none";
+						document.getElementById("general_content").style.display = "none";
 						document.getElementById("file_manager").style.display = "none";
 						
 					}else{
 						//alert('hoooo');
 						document.getElementById("without_content").style.display = "none";
 						document.getElementById("with_content").style.display = "";
+						document.getElementById("general_content").style.display = "none";
 						document.getElementById("file_manager").style.display = "";
 					}
 					
@@ -1091,6 +1227,14 @@
 						document.getElementById("without_content").style.display = "none";
 						document.getElementById("with_content").style.display = "";
 						document.getElementById("file_manager").style.display = "";
+						document.getElementById("general_content").style.display = "none";
+					}
+			function show_general(){
+						//alert('hoooo');
+						document.getElementById("without_content").style.display = "none";
+						document.getElementById("general_content").style.display = "";
+						document.getElementById("with_content").style.display = "none";
+						document.getElementById("file_manager").style.display = "none";
 					}
                window.onload = function() {
                    var elements = getElementsByClassName('editInPlace', '*', document);
@@ -1153,7 +1297,27 @@
 						}
                     });
                 });
+				var table = $('#example2');
+		
+				var tableWrapper = jQuery('#example2_wrapper');
 
+				table.find('.group-checkable').change(function () {
+					var set = jQuery(this).attr("data-set");
+					var checked = jQuery(this).is(":checked");
+					jQuery(set).each(function () {
+						if (checked) {
+							$(this).prop("checked", true);
+							$(this).parents('tr').addClass("active");					
+						} else {
+							$(this).prop("checked", false);
+							$(this).parents('tr').removeClass("active");
+						}				
+					});
+				});
+
+				table.on('change', 'tbody tr .checkboxes', function () {
+					$(this).parents('tr').toggleClass("active");			
+				});
                 // disable wrapping
                 $(document).on('click', '[data-toggle="lightbox"][data-gallery="example-gallery-11"]', function(event) {
                     event.preventDefault();
@@ -1228,6 +1392,15 @@
 				document.getElementById("thumbnails").style.display = "none";
 				document.getElementById("lists").style.display = "";
 			});
+			function show_hide(val){
+				var drop_val = val.value;
+				if(drop_val == "create"){
+					document.getElementById("folder_name").style.display = "";
+				}else{
+					document.getElementById("folder_name").style.display = "none";
+				}
+			}
+			
         </script>
          </body>
       </html>
\ No newline at end of file
diff --git a/Forwarder/contactlist.html b/Forwarder/contactlist.html
index 6f967b7..3534fc6 100644
--- a/Forwarder/contactlist.html
+++ b/Forwarder/contactlist.html
@@ -218,14 +218,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
diff --git a/Forwarder/deliveryarrange.html b/Forwarder/deliveryarrange.html
index 914a412..e826add 100644
--- a/Forwarder/deliveryarrange.html
+++ b/Forwarder/deliveryarrange.html
@@ -232,7 +232,7 @@ License: You must have a valid license purchased only from themeforest(the above
 								<center><img src="../assets/global/img/logo.png" style="height:auto ; width:60%"/></center>
 							</li>
 							<hr>
-                            <li class="nav-item start ">
+                            <li class="nav-item start">
                                 <a href="index.html" class="nav-link nav-toggle">
                                     <i class="icon-home"></i>
                                     <span class="title">Order Status</span>
@@ -246,15 +246,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <span class="selected"></span>
                                 </a>
                             </li>
-							
-                            <li class="nav-item active open ">
+                            
+                            <li class="nav-item active open">
                                 <a href="deliveryarrange.html" class="nav-link nav-toggle">
                                     <i class="fa fa-briefcase"></i>
                                     <span class="title">Delivery Arrangement</span>
                                     <span class="selected"></span>
                                 </a>
                             </li>
-                            
 						<li class="nav-item">
 							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
@@ -288,7 +287,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">
                                         <a href="formcustomize.html" class="nav-link ">
                                             <i class="icon-clock"></i>
                                             <span class="title">Form Customization</span>
@@ -552,7 +551,7 @@ Vehicle No: WAA 123 C
 </textarea>
 															</div>
 															<div class="col-md-2">
-																<button type="button" class="btn green" onclick="confirm('Your delivery arrangement are send via Messenger and SMS to Importer Admin account. Please ask your importer to confirm your arrangement.')"><i class="fa fa-comments-o"></i> Send</button>
+																<a href="chat.html" class="btn green" onclick="confirm('Your delivery arrangement are send via Messenger and SMS to Importer Admin account. Please ask your importer to confirm your arrangement.')"><i class="fa fa-comments-o"></i> Send</a>
 															</div>
 														</div>
 													</div>  
@@ -566,6 +565,40 @@ Vehicle No: WAA 123 C
 							</div>
 							<!-- /.modal-dialog -->
 						</div>
+						
+						<div class="modal fade in" id="reason" tabindex="-1" role="basic" aria-hidden="true">
+							<div class="modal-dialog">
+								<div class="modal-content">
+									<div class="modal-header" style="background-color: #3598dc">
+										<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+										
+										<div class="caption" style="color: #FFF;padding: 11px 0 9px;float: left;display: inline-block;font-size: 18px;line-height: 18px;font-family:'Open Sans',sans-serif;">
+                                            <i class="fa fa-gift" style="    float: left;margin-top: 4px;display: inline-block;font-size: 13px;margin-right: 5px;"></i>Failed Delivery Reason
+										</div>
+									</div>
+									<div class="modal-body"> 
+										<div class="form">
+											<div class="row">
+												<div class="col-md-12">
+													<div class="form-group">
+														<label>Title</label>
+														<input class="form-control">
+													</div>
+													<div class="form-group">
+														<label>Reason</label>
+														<textarea class="form-control" rows="3"></textarea>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+									<div class="modal-footer">
+										<button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
+										<button type="button" class="btn green">Send</button>
+									</div>
+								</div>
+							</div>
+						</div>
                     </div>
                     <!-- END CONTENT BODY -->
                 </div>
@@ -1179,14 +1212,14 @@ 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","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","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","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","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='#form_delivery' data-toggle='modal'>Fail to Deliver</a></div>", "Not Completed"],
-				["5","<span style='color:red;'><strong>10-07-2017</strong></span>","Vehicle No:JLK3333<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/0004","CTN56","Bangi<br>Selangor","123456","29-06-2017","29-06-2017","Delivery Request <span style='color:#ed6b75;font-weight: 700;'>Refused</span>", "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","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='#form_delivery' 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","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","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","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","<span style='color:red;'><strong>10-07-2017</strong></span>","Vehicle No:JLK3333<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>","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7<br> Contact No: 0123456789","CIEF/0004","CTN56","Bangi<br>Selangor","123456","29-06-2017","29-06-2017","Delivery Request <span style='color:#ed6b75;font-weight: 700;'>Refused</span>", "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"]
             ];
 			
             var dataSet2 = [
@@ -1216,7 +1249,7 @@ Vehicle No: WAA 123 C
 					'targets': [0]
 				},
 				{
-					"targets": [ 11 ],
+					"targets": [ 12 ],
 					"visible": false
 				}],
 				// scroller extension: http://datatables.net/extensions/scroller/
@@ -1265,16 +1298,17 @@ Vehicle No: WAA 123 C
 					{ title: 'Order No<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_3\')"></span>' },
 					{ title: 'Customer<br>Code<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_4\')"></span>' },
 					{ title: 'Shipment<br>No<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_5\')"></span>' },
-					{ title: 'Area<br>State<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_6\')"></span>' },
-					{ title: 'Container No<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_7\')"></span>' },
-					{ title: 'ETD<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_8\')"></span>' },
-					{ title: 'ETA<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_9\')"></span>' },
-					{ title: 'Status<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_10\')"></span>' },
+					{ 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: 'Status<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_11\')"></span>' },
 					{ title: 'Stats' },
 				],
 
                 initComplete: function () {
-                    configFilter(this, [1, 2,3, 4,5,6,7,8,9,10]);
+                    configFilter(this, [1, 2,3, 4,5,6,7,8,9,10,11]);
                 }
             });
         
@@ -1330,12 +1364,12 @@ Vehicle No: WAA 123 C
                     configFilter(this, [ 2,3, 4,5,6,7,8]);
                 }
             });
-			table1.columns( 11 ).search( 'Not Completed' ).draw();
+			table1.columns( 12 ).search( 'Not Completed' ).draw();
 		$('.asdasd').on('switchChange.bootstrapSwitch', function (event, state) {
 		if(state == true){
-			table1.columns( 11 ).search( 'Not Completed' ).draw();
+			table1.columns( 12 ).search( 'Not Completed' ).draw();
 		}else{
-			table1.columns( 11 ).search( 'Completed' ).draw();
+			table1.columns( 12 ).search( 'Completed' ).draw();
 			
 		}
 		
diff --git a/Forwarder/formcustomize.html b/Forwarder/formcustomize.html
index 7e54b3c..084c50e 100644
--- a/Forwarder/formcustomize.html
+++ b/Forwarder/formcustomize.html
@@ -177,14 +177,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -209,7 +209,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 open">
+                                    <li class="nav-item active open ">
                                         <a href="formcustomize.html" class="nav-link ">
                                             <i class="icon-clock"></i>
                                             <span class="title">Form Customization</span>
diff --git a/Forwarder/index.html b/Forwarder/index.html
index edf6839..c6bcf3e 100644
--- a/Forwarder/index.html
+++ b/Forwarder/index.html
@@ -186,14 +186,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
diff --git a/Forwarder/notice.html b/Forwarder/notice.html
index 94cb28e..393553e 100644
--- a/Forwarder/notice.html
+++ b/Forwarder/notice.html
@@ -156,7 +156,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <span class="selected"></span>
                                 </a>
                             </li>
-                            <li class="nav-item  active open ">
+                            <li class="nav-item active open ">
                                 <a href="notice.html" class="nav-link nav-toggle">
                                     <i class="fa fa-newspaper-o"></i>
                                     <span class="title">Notice</span>
@@ -172,20 +172,20 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
                             </a>
                         </li>
-							<li class="nav-item">
+							<li class="nav-item ">
                                 <a href="profile.html" class="nav-link nav-toggle">
                                     <i class="icon-user"></i>
                                     <span class="title">Profile</span>
diff --git a/Forwarder/profile.html b/Forwarder/profile.html
index cfc8808..e702551 100644
--- a/Forwarder/profile.html
+++ b/Forwarder/profile.html
@@ -172,14 +172,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -217,7 +217,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li>                    
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/profile2.html b/Forwarder/profile2.html
index 95aea59..814ae18 100644
--- a/Forwarder/profile2.html
+++ b/Forwarder/profile2.html
@@ -171,14 +171,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -216,7 +216,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li> 
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/profileedris.html b/Forwarder/profileedris.html
index f886d64..e199e2e 100644
--- a/Forwarder/profileedris.html
+++ b/Forwarder/profileedris.html
@@ -171,14 +171,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -216,7 +216,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li>                  
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/profilelinda.html b/Forwarder/profilelinda.html
index f886d64..4e5a501 100644
--- a/Forwarder/profilelinda.html
+++ b/Forwarder/profilelinda.html
@@ -171,14 +171,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -216,7 +216,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li>               
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/team.html b/Forwarder/team.html
index b5af4ac..63d5053 100644
--- a/Forwarder/team.html
+++ b/Forwarder/team.html
@@ -179,14 +179,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -224,7 +224,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li>                     
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/team2.html b/Forwarder/team2.html
index 3fb68ef..1675191 100644
--- a/Forwarder/team2.html
+++ b/Forwarder/team2.html
@@ -173,14 +173,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
@@ -218,7 +218,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li>                        
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/trackorder.html b/Forwarder/trackorder.html
index cd457b8..fc2fee5 100644
--- a/Forwarder/trackorder.html
+++ b/Forwarder/trackorder.html
@@ -149,20 +149,20 @@ License: You must have a valid license purchased only from themeforest(the above
                         </li>
                         <hr>
                         <li class="nav-item start">
-                            <a href="index.html" class="nav-link nav-toggle">
-                                <i class="icon-home"></i>
-                                <span class="title">Order Status</span>
-                                <span class="selected"></span>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="notice.html" class="nav-link nav-toggle">
-                                <i class="fa fa-newspaper-o"></i>
-                                <span class="title">Notice</span>
-                                <span class="selected"></span>
-                            </a>
-                        </li>
-                        
+                                <a href="index.html" class="nav-link nav-toggle">
+                                    <i class="icon-home"></i>
+                                    <span class="title">Order Status</span>
+                                    <span class="selected"></span>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a href="notice.html" class="nav-link nav-toggle">
+                                    <i class="fa fa-newspaper-o"></i>
+                                    <span class="title">Notice</span>
+                                    <span class="selected"></span>
+                                </a>
+                            </li>
+                            
                             <li class="nav-item">
                                 <a href="deliveryarrange.html" class="nav-link nav-toggle">
                                     <i class="fa fa-briefcase"></i>
@@ -170,53 +170,53 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <span class="selected"></span>
                                 </a>
                             </li>
-                        <li class="nav-item">
-                            <a href="chat.html" class="nav-link nav-toggle">
-                                <i class="fa fa-comments-o"></i>
-                                <span class="title">Messenger</span>
-                                <span class="selected"></span>
-                            </a>
-                        </li>
-                        <li class="nav-item  active open">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+						<li class="nav-item">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
+								<i class="fa fa-comments-o"></i>
+								<span class="title">Messenger</span>
+								<span class="selected"></span>
+							</a>
+						</li>
+                        <li class="nav-item active open ">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
                             </a>
                         </li>
-                        <li class="nav-item">
-                            <a href="profile.html" class="nav-link nav-toggle">
-                                <i class="icon-user"></i>
-                                <span class="title">Profile</span>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="contactlist.html" class="nav-link nav-toggle">
-                                <i class="icon-notebook"></i>
-                                <span class="title">Contact List</span>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="javascript:;" class="nav-link nav-toggle">
-                                <i class="icon-settings"></i>
-                                <span class="title">Settings</span>
-                                <span class="arrow"></span>
-                            </a>
-                            <ul class="sub-menu">
-                                <li class="nav-item  ">
-                                    <a href="formcustomize.html" class="nav-link ">
-                                        <i class="icon-clock"></i>
-                                        <span class="title">Form Customization</span>
-                                    </a>
-                                </li>
-                                <li class="nav-item">
-                                    <a href="updatecurrency.html" class="nav-link ">
-                                        <i class="icon-check"></i>
-                                        <span class="title">Update Currency</span>
-                                    </a>
-                                </li>
-                            </ul>
-                        </li>
+							<li class="nav-item ">
+                                <a href="profile.html" class="nav-link nav-toggle">
+                                    <i class="icon-user"></i>
+                                    <span class="title">Profile</span>
+                                </a>
+                            </li>						
+                            <li class="nav-item">
+                                <a href="contactlist.html" class="nav-link nav-toggle">
+                                    <i class="icon-notebook"></i>
+                                    <span class="title">Contact List</span>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a href="javascript:;" class="nav-link nav-toggle">
+                                    <i class="icon-settings"></i>
+                                    <span class="title">Settings</span>
+                                    <span class="arrow"></span>
+                                </a>
+                                <ul class="sub-menu">
+                                    <li class="nav-item  ">
+                                        <a href="formcustomize.html" class="nav-link ">
+                                            <i class="icon-clock"></i>
+                                            <span class="title">Form Customization</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="updatecurrency.html" class="nav-link ">
+                                            <i class="icon-check"></i>
+                                            <span class="title">Update Currency</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                            </li> 
                     </ul>
                         <!-- END SIDEBAR MENU -->
                         <!-- END SIDEBAR MENU -->
diff --git a/Forwarder/updatecurrency.html b/Forwarder/updatecurrency.html
index a8c0957..ebe61da 100644
--- a/Forwarder/updatecurrency.html
+++ b/Forwarder/updatecurrency.html
@@ -172,20 +172,20 @@ License: You must have a valid license purchased only from themeforest(the above
                                 </a>
                             </li>
 						<li class="nav-item">
-							<a href="chat.html" class="nav-link nav-toggle">
+							<a href="chat.html?menu=true" class="nav-link nav-toggle">
 								<i class="fa fa-comments-o"></i>
 								<span class="title">Messenger</span>
 								<span class="selected"></span>
 							</a>
 						</li>
                         <li class="nav-item">
-                            <a href="trackorder.html" class="nav-link nav-toggle">
+                            <a href="trackorder.html?menu=true" class="nav-link nav-toggle">
                                 <i class="icon-basket"></i>
                                 <span class="title">Track Order</span>
                                 <span class="selected"></span>
                             </a>
                         </li>
-							<li class="nav-item">
+							<li class="nav-item ">
                                 <a href="profile.html" class="nav-link nav-toggle">
                                     <i class="icon-user"></i>
                                     <span class="title">Profile</span>
@@ -197,7 +197,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <span class="title">Contact List</span>
                                 </a>
                             </li>
-                            <li class="nav-item active open">
+                            <li class="nav-item  active open ">
                                 <a href="javascript:;" class="nav-link nav-toggle">
                                     <i class="icon-settings"></i>
                                     <span class="title">Settings</span>
@@ -210,14 +210,14 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <span class="title">Form Customization</span>
                                         </a>
                                     </li>
-                                    <li class="nav-item  active open">
+                                    <li class="nav-item  active open ">
                                         <a href="updatecurrency.html" class="nav-link ">
                                             <i class="icon-check"></i>
                                             <span class="title">Update Currency</span>
                                         </a>
                                     </li>
                                 </ul>
-                            </li>                       
+                            </li>                      
                             
                         </ul>
                         <!-- END SIDEBAR MENU -->