diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php
index 9b09b25e..650fa120 100644
--- a/application/third_party/order/views/ah/confirm_order.php
+++ b/application/third_party/order/views/ah/confirm_order.php
@@ -399,8 +399,6 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						information to book all your hotels, transportation, and activities. If the information you
 						provide is incorrect, you would not be able to board your flight or trains, and therefore
 						reissuing of tickets would be at your expense!</p>
-					<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
-
 					<div class="traveler_info">
 						<h3 data-header>Primary contact</h3>
 						<div class="selectionBlock">
@@ -719,6 +717,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					<p>Your flight information will be forwarded to your guide/driver for airport pick up and drop off.
 						Please ensure the details you provide are correct. You can skip this if your don't need airport
 						transfer service.</p>
+					<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
+
 
 					<div class="selectionBlock" style="width: 100%;">
 
diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index 9bd3b47c..86f065d5 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -399,7 +399,6 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						information to book all your hotels, transportation, and activities. If the information you
 						provide is incorrect, you would not be able to board your flight or trains, and therefore
 						reissuing of tickets would be at your expense!</p>
-					<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
 
 					<div class="traveler_info">
 						<h3 data-header>Primary contact</h3>
@@ -719,7 +718,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					<h2>Your Flight Information</h2>
 					<p>Your flight information will be forwarded to your guide/driver for airport pick up and drop off.
 						Please ensure the details you provide are correct. You can skip this if your don't need airport
-						transfer service.</p>
+						transfer service.</p>          
+					<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
 
 					<div class="selectionBlock" style="width: 100%;">
 
diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php
index 3ca9fdf1..d5f045dd 100644
--- a/application/third_party/order/views/gh/confirm_order.php
+++ b/application/third_party/order/views/gh/confirm_order.php
@@ -400,7 +400,6 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						information to book all your hotels, transportation, and activities. If the information you
 						provide is incorrect, you would not be able to board your flight or trains, and therefore
 						reissuing of tickets would be at your expense!</p>
-					<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
 
 					<div class="traveler_info">
 						<h3 data-header>Primary contact</h3>
@@ -721,6 +720,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					<p>Your flight information will be forwarded to your guide/driver for airport pick up and drop off.
 						Please ensure the details you provide are correct. You can skip this if your don't need airport
 						transfer service.</p>
+					<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
 
 					<div class="selectionBlock">
 
diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php
index 72d9fce3..5ee8cff9 100644
--- a/application/views/mobile_first/ah-gp-form.php
+++ b/application/views/mobile_first/ah-gp-form.php
@@ -12,9 +12,9 @@
 							Adults and kids (≥10 years old)
 					   </p>
 					   <div class="numberBtn">
-						<input class="minaddBtn reduceadult" id="minusAdult" type="button" value="-">
-						<input class="number" type="text" id="adultNumber"  readonly value="1" name="adult">
-						<input class="minaddBtn addadult" id="plusAdult"  type="button" value="+">
+						<input class="minaddBtn reduceadult" id="minusAdult" type="button" value="-" style="width: 50px !important;">
+						<input class="number" type="text" id="adultNumber"  readonly value="1" name="adult" style="width: 70px !important; text-align: center;">
+						<input class="minaddBtn addadult" id="plusAdult"  type="button" value="+" style="width: 50px !important;">
 					</div>
 					</div>
 				</div>
@@ -470,20 +470,4 @@
 			
 		});
 	})(document);
-	</script>
-    <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
-<style type="text/css">
-.emailist{border:1px solid #bdbdbd; border-radius: 4px; background-color:#fff; color:#666; font-size:14px; list-style-type:0; padding:0; margin:0; overflow:hidden;}
-.emailist li{    padding: 2px 11px;
-    cursor: pointer;
-    font-size: 18px;
-    text-shadow: none;
-    color: #000;
-}
-.emailist .on, .emailist li:hover{background-color:#eee;}
-</style>
-<script>
-  $("#email").mailAutoComplete({
-    email: ['gmail.com','outlook.com','yahoo.com','icloud.com','hotmail.com','live.com','aol.com']
-  });
-</script>
\ No newline at end of file
+	</script>
\ No newline at end of file
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 237e4c34..ad0871a5 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -535,7 +535,6 @@ margin-bottom: 10px;
 
 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/flatpickr-4.6.1.min.js"></script>
 <script>
-
   var selectedExpectedDate = '';
 document.addEventListener('DOMContentLoaded', () => {
     flatpickr("#starting_date", {
@@ -695,7 +694,7 @@ function validateQuickInquiryForm() {
     });
   })
     </script>
-    <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
+
     <style>
 .date_select {width: 31% !important;}
 @media (max-width: 750px){
@@ -703,19 +702,3 @@ function validateQuickInquiryForm() {
     .date_select label {font-size:17px !important;}
 }
         </style>
-
-<style type="text/css">
-.emailist{border:1px solid #bdbdbd; border-radius: 4px; background-color:#fff; color:#666; font-size:14px; list-style-type:0; padding:0; margin:0; overflow:hidden;}
-.emailist li{    padding: 2px 11px;
-    cursor: pointer;
-    font-size: 18px;
-    text-shadow: none;
-    color: #000;
-}
-.emailist .on, .emailist li:hover{background-color:#eee;}
-</style>
-<script>
-  $("#email").mailAutoComplete({
-    email: ['gmail.com','outlook.com','yahoo.com','icloud.com','hotmail.com','live.com','aol.com']
-  });
-</script>
diff --git a/application/views/mobile_first/ah-lantern-festival-gp-form.php b/application/views/mobile_first/ah-lantern-festival-gp-form.php
index 5744f173..8ca2acef 100644
--- a/application/views/mobile_first/ah-lantern-festival-gp-form.php
+++ b/application/views/mobile_first/ah-lantern-festival-gp-form.php
@@ -469,20 +469,4 @@
 			
 		});
 	})(document);
-	</script>
-<script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
-<style type="text/css">
-.emailist{border:1px solid #bdbdbd; border-radius: 4px; background-color:#fff; color:#666; font-size:14px; list-style-type:0; padding:0; margin:0; overflow:hidden;}
-.emailist li{    padding: 2px 11px;
-    cursor: pointer;
-    font-size: 18px;
-    text-shadow: none;
-    color: #000;
-}
-.emailist .on, .emailist li:hover{background-color:#eee;}
-</style>
-<script>
-  $("#email").mailAutoComplete({
-    email: ['gmail.com','outlook.com','yahoo.com','icloud.com','hotmail.com','live.com','aol.com']
-  });
-</script>
\ No newline at end of file
+	</script>
\ No newline at end of file
diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php
index 0c4961b1..ce3be9eb 100644
--- a/application/views/mobile_first/ah-lantern-form-info-page.php
+++ b/application/views/mobile_first/ah-lantern-form-info-page.php
@@ -573,20 +573,4 @@
         }
         return result;
     }
-</script>
-<script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
-<style type="text/css">
-.emailist{border:1px solid #bdbdbd; border-radius: 4px; background-color:#fff; color:#666; font-size:14px; list-style-type:0; padding:0; margin:0; overflow:hidden;}
-.emailist li{    padding: 2px 11px;
-    cursor: pointer;
-    font-size: 18px;
-    text-shadow: none;
-    color: #000;
-}
-.emailist .on, .emailist li:hover{background-color:#eee;}
-</style>
-<script>
-  $("#email").mailAutoComplete({
-    email: ['gmail.com','outlook.com','yahoo.com','icloud.com','hotmail.com','live.com','aol.com']
-  });
 </script>
\ No newline at end of file
diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php
index c0bc9080..6638504f 100644
--- a/application/views/mobile_first/ah-lantern-form.php
+++ b/application/views/mobile_first/ah-lantern-form.php
@@ -571,20 +571,4 @@
         }
         return result;
     }
-</script>
-<script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
-<style type="text/css">
-.emailist{border:1px solid #bdbdbd; border-radius: 4px; background-color:#fff; color:#666; font-size:14px; list-style-type:0; padding:0; margin:0; overflow:hidden;}
-.emailist li{    padding: 2px 11px;
-    cursor: pointer;
-    font-size: 18px;
-    text-shadow: none;
-    color: #000;
-}
-.emailist .on, .emailist li:hover{background-color:#eee;}
-</style>
-<script>
-  $("#email").mailAutoComplete({
-    email: ['gmail.com','outlook.com','yahoo.com','icloud.com','hotmail.com','live.com','aol.com']
-  });
 </script>
\ No newline at end of file
diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index 4f504ed9..a07daa16 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -743,7 +743,7 @@ function validateQuickInquiryForm() {
 		});
   })
     </script>
-    <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
+ 
 	 <style>
 		.date_select {width: 31% !important;}
 		@media (max-width: 750px){