diff --git a/Forwarder/deliveryarrange.html b/Forwarder/deliveryarrange.html
index ac25310..914a412 100644
--- a/Forwarder/deliveryarrange.html
+++ b/Forwarder/deliveryarrange.html
@@ -385,7 +385,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                         <div class="table-container">
 										
                                             <div id="mask"></div>
-											<span class='pull-right'><input type='checkbox' class='make-switch pull-right asdasd' checked data-size='small' data-on-color='success' data-on-text='ON' data-off-color='default' data-off-text='OFF'></span>
+											<span id="switch" class="pull-right" style="margin-left:5px; margin-right:5px;">Status : &nbsp;&nbsp;<input type='checkbox' class='make-switch pull-right asdasd' checked data-size='small' data-on-color='success' data-on-text='ON' data-off-color='default' data-off-text='OFF'></span>
 											<table id="example" class="table table-striped table-bordered table-hover order-column"></table>
 											
                                         </div>
@@ -414,9 +414,9 @@ License: You must have a valid license purchased only from themeforest(the above
 														<label>Delivery Type</label>
 														<select id="type" class="form-control" onchange="show_hide(this);">
 															<option value=""> Please Select</option>
-															<option value="1"> Company Transport</option>
+															<option value="1"> Inhouse Services</option>
 															<option value="2"> Courier Service</option>
-															<option value="3"> Outsource Services</option>
+															<option value="3"> Outsource Service</option>
 															<option value="4"> Self Collect</option>
 														</select>	
 
@@ -464,7 +464,7 @@ License: You must have a valid license purchased only from themeforest(the above
 												<div class="col-md-12">
 													<div class="col-md-6">
 														<div class="form-group">
-															<label>Courier Service</label>
+															<label>Courier Service Name</label>
 															<input class="form-control">
 														</div>
 														<div class="form-group">
@@ -482,10 +482,38 @@ License: You must have a valid license purchased only from themeforest(the above
 										<div class="form">
 											<div class="row">
 												<div class="col-md-12">
+													<div class="col-md-6">
+														<div class="form-group">
+															<label>Warehouse</label>
+															<select id="warehouse" class="form-control">
+																<option> Please Select / Create New</option>
+																<option value="WHA">Warehouse A</option>
+																<option value="WHB">Warehouse B</option>
+																<option value="WHC">Warehouse C</option>
+																<option value="WHD">Warehouse D</option>
+															</select>
+														</div>
+														<div class="form-group">
+															<label>Contact Person Name</label>
+															<input id ="contact" class="form-control" value="" />
+														</div>
+														<div class="form-group">
+															<label>Contact Person No.</label>
+															<input id ="contactno" class="form-control" value="" />
+														</div>
+													</div>
 													<div class="col-md-6">
 														<div class="form-group">
 															<label>Address</label>
-															<textarea  class="form-control">Block 3730, Persiaran Apec, 63000 Cyberjaya, Selangor, Malaysia</textarea>
+															<textarea id ="address" class="form-control"></textarea>
+														</div>
+														<div class="form-group">
+															<label>City</label>
+															<input id ="city" class="form-control" value="" />
+														</div>
+														<div class="form-group">
+															<label>State</label>
+															<input id ="state" class="form-control" value="" />
 														</div>
 													</div>
 												</div>
@@ -511,10 +539,10 @@ License: You must have a valid license purchased only from themeforest(the above
 													<div class="form-group">
 														<div class="row">
 															<div class="col-md-10">
-																<textarea class="form-control" rows="10">
+																<textarea id="message" class="form-control" rows="10">
 CIEF Delivery Message
 
-Order No: 0005 
+Order No: <<order_no>> 
 Delivery Date: 03-07-2017
 Driver Name: Bob 
 Driver Contact No: 013-3456789
@@ -1154,9 +1182,9 @@ Vehicle No: WAA 123 C
 				["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' href='#form_delivery' data-toggle='modal'>Rearrange</a></div>", "Not Completed"],
-				["5","03-07-2017","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><br><div style='margin-top: 10px;'  class='btn-group'><a class='btn red btn-xs btn-circle' href='#form_delivery' data-toggle='modal'>Rearrange</a></div>", "Not Completed"],
-				["6","03-07-2017","Vehicle No:JKB1111<br/>Contact Person:Samad<br/>Contact No: 012345689","<a class='chat_link' href='chat.html'> 00001 <span style='margin-bottom: 20px;' class='bb badge badge-danger'>5</span></a>","CIEF/0003","CTN56","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' href='#form_delivery' data-toggle='modal'>Rearrange</a></div>", "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"]
             ];
@@ -1217,11 +1245,11 @@ Vehicle No: WAA 123 C
 				},
 				"order": [[ 1, "asc" ]],
 				"pageLength": 20,
-				"dom": "<'row' <'col-md-12'T>><'row'<'col-md-6'f><'col-md-6'B>r>t<'row'<'col-md-5 col-sm-12'i><'col-md-7 col-sm-12'p>>",
+				"dom": "<'row' <'col-md-12'T>><'row'<'col-md-6'f><'col-md-6'<'toolbar2'B>>r>t<'row'<'col-md-5 col-sm-12'i><'col-md-7 col-sm-12'p>>",
 				buttons: [
 					{
 						text: 'Delivery Arrangement',
-						className: 'btn red btn-inline qweqwe',
+						className: 'btn red  btn-circle btn-outline qweqwe',
 						action: function ( e, dt, node, config ) {
 							$("#qweqwe").trigger('click');
 						}
@@ -1312,6 +1340,8 @@ Vehicle No: WAA 123 C
 		}
 		
 		});
+		existingdiv1 = document.getElementById( "switch" );
+		$( "div.toolbar2" ).append( existingdiv1 );
         $("div.toolbar").html('Total Delivery : <p id="total" class="form-control-static">0</p>');
 		$('#sample_3_tools > li > a.tool-action').on('click', function() {
             var action = $(this).attr('data-action');
@@ -1409,6 +1439,46 @@ Vehicle No: WAA 123 C
                 });
             }, 50);
         }
+		$('#warehouse').change(function(){
+			var warehouse = $('#warehouse').val();
+			if(warehouse == "WHA"){
+				var new_warehouse = "Block 3730, Persiaran Apec, 63000 Cyberjaya, Selangor, Malaysia";
+				var new_city = "Cyberjaya";
+				var new_state = "Selangor";
+				var new_contact = "Aaron Aziz";
+				var new_contactno = "0123456789";
+			}else if(warehouse == "WHB"){
+				var new_warehouse = "70 McCullough Dr, New Castle, 19720 Delaware, United State of America";
+				var new_city = "New Castle";
+				var new_state = "Delaware";
+				var new_contact = "Aliff Aziz";
+				var new_contactno = "0123456789";
+			}else if(warehouse == "WHC"){
+				var new_warehouse = "96-100 Beaconsfield St., Silverwater, Sydney, 2128 New South Wales, Australia";
+				var new_city = "Sydney";
+				var new_state = "New South Wales";
+				var new_contact = "Selkom";
+				var new_contactno = "0123456789";
+			}else if(warehouse == "WHD"){
+				var new_warehouse = "Room I, 9F No.288 South ZhongShan Rd, 210005 Nanjing, JiangSu, China";
+				var new_city = "Nanjing";
+				var new_state = "JiangSu";
+				var new_contact = "Ahmad Albab";
+				var new_contactno = "0123456789";
+			}
+			$("textarea#address").val(new_warehouse);
+			$("input#state").val(new_state);
+			$("input#city").val(new_city);
+			$("input#contact").val(new_contact);
+			$("input#contactno").val(new_contactno);
+			
+			var addr = $("textarea#address").val();
+			var ctc = $("input#contact").val();
+			var ctcno = $("input#contactno").val();
+			var new_message = "CIEF Delivery Message \n\n Order no : <<order_no>> \n Self Collect Status : Ready \n Warehouse Address: " + addr + "\n Contact Person : " + ctc + " ("  + ctcno + ") \n\n * Kindly proceed to the messenger to confirm";
+			$("textarea#message").val(new_message);
+
+		});
         var modalFilterArray = {};
         //User to show the filter modal
         function showFilter(e, index) {
@@ -1481,17 +1551,24 @@ Vehicle No: WAA 123 C
 			}else if(drop_val == 2){
 				document.getElementById("courier").style.display = "";
 				document.getElementById("own_transport").style.display = "none";
-				document.getElementById("self_collect").style.display = "none";
+				document.getElementById("self_collect").style.display = "none";				
 			}else if(drop_val == 4){
 				document.getElementById("self_collect").style.display = "";
 				document.getElementById("courier").style.display = "none";
 				document.getElementById("own_transport").style.display = "none";
+				var addr = $("textarea#address").val();
+				var ctc = $("input#contact").val();
+				var ctcno = $("input#contactno").val();
+				var new_message = "CIEF Delivery Message \n\n Order no : <<order_no>> \n Self Collect Status : Ready \n Warehouse Address: " + addr + "\n Contact Person : " + ctc + " ("  + ctcno + ") \n\n * Kindly proceed to the messenger to confirm";
+				$("textarea#message").val(new_message);
 			}else{
 				document.getElementById("self_collect").style.display = "none";
 				document.getElementById("courier").style.display = "none";
 				document.getElementById("own_transport").style.display = "none";
 			}
 		}
+		
+
     </script>
 	 
     </body>
diff --git a/Forwarder/profile.html b/Forwarder/profile.html
index 82a4612..cfc8808 100644
--- a/Forwarder/profile.html
+++ b/Forwarder/profile.html
@@ -270,7 +270,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <i class="icon-settings"></i> Account Settings </a>
                                                 </li>
                                                 <li>
-                                                    <a href="company.html">
+                                                    <a href="team.html">
                                                         <i class="icon-info"></i> Company Settings </a>
                                                 </li>
                                             </ul>
diff --git a/Forwarder/team.html b/Forwarder/team.html
index 9a05a9a..b5af4ac 100644
--- a/Forwarder/team.html
+++ b/Forwarder/team.html
@@ -276,7 +276,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <i class="icon-settings"></i> Account Settings </a>
                                                 </li>
                                                 <li  class="active">
-                                                    <a href="company.html">
+                                                    <a href="team.html">
                                                         <i class="icon-info"></i> Company Settings </a>
                                                 </li>
                                             </ul>
@@ -427,7 +427,7 @@ License: You must have a valid license purchased only from themeforest(the above
 																		<td class="center editInPlace"class="center editInPlace"> Delaware  </td>
 																		<td class="center editInPlace"class="center editInPlace"> USA  </td>
 																		<td class="center editInPlace"> Our warehouse will be close from 29th July 2017 to 30th July 2017 for the Thanks Giving holiday.</td>
-																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><div class="btn-group" style="margin-left:5px;"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle" style="color:#c50b0b;"></i> </a></div></td>
+																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><br><center><div class="btn-group"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle  fa-3" style="color:#c50b0b;"></i> </a></div></center></td>
 																	</tr>
 																	<tr>
 																		<td class="center editInPlace"> WH B</td>
@@ -435,7 +435,7 @@ License: You must have a valid license purchased only from themeforest(the above
 																		<td class="center editInPlace"> New South Wales  </td>
 																		<td class="center editInPlace"> Australia  </td>
 																		<td class="center editInPlace"> </td>
-																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><div class="btn-group" style="margin-left:5px;"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle" style="color:#c50b0b;"></i> </a></div></td>
+																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><br><center><div class="btn-group"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle  fa-3" style="color:#c50b0b;"></i> </a></div></center></td>
 																	</tr>
 																	<tr>
 																		<td class="center editInPlace"> WH C</td>
@@ -443,7 +443,7 @@ License: You must have a valid license purchased only from themeforest(the above
 																		<td class="center editInPlace"> TSUEN WAN  </td>
 																		<td class="center editInPlace"> HONG KONG  </td>
 																		<td class="center editInPlace"></td>
-																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><div class="btn-group" style="margin-left:5px;"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle" style="color:#c50b0b;"></i> </a></div></td>
+																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><br><center><div class="btn-group"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle  fa-3" style="color:#c50b0b;"></i> </a></div></center></td>
 																	</tr>
 																	<tr>
 																		<td class="center editInPlace"> WH D</td>
@@ -451,7 +451,7 @@ License: You must have a valid license purchased only from themeforest(the above
 																		<td class="center editInPlace"> JiangSu  </td>
 																		<td class="center editInPlace"> China  </td>
 																		<td class="center editInPlace"> Chinese New Year </td>
-																		<td style="vertical-align:middle;"> <input type="checkbox" class="make-switch" data-size="small" ><div class="btn-group" style="margin-left:5px;"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle" style="color:#c50b0b;"></i> </a></div></td>
+																		<td style="vertical-align:middle;"> <input type="checkbox" class="make-switch" data-size="small" ><br><center><div class="btn-group"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle  fa-3" style="color:#c50b0b;"></i> </a></div></center></td>
 																	</tr>
 																	<tr>
 																		<td class="center editInPlace"> WH E</td>
@@ -459,7 +459,7 @@ License: You must have a valid license purchased only from themeforest(the above
 																		<td class="center editInPlace"> Delaware </td>
 																		<td class="center editInPlace"> USA  </td>
 																		<td class="center editInPlace"> Our warehouse will be close from 29th July 2017 to 30th July 2017 for the Thanks Giving holiday.</td>
-																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><div class="btn-group" style="margin-left:5px;"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle" style="color:#c50b0b;"></i> </a></div></td>
+																		<td style="vertical-align:middle;"> <input type="checkbox" checked class="make-switch" data-size="small" ><br><center><div class="btn-group"><a class="delete" href="javascript:;"> <i class="fa fa-times-circle  fa-3" style="color:#c50b0b;"></i> </a></div></center></td>
 																	</tr>
 																</tbody>
 															</table>