diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php
index 604a4827..cb8e055e 100644
--- a/application/third_party/order/views/ah/confirm_order.php
+++ b/application/third_party/order/views/ah/confirm_order.php
@@ -354,6 +354,13 @@ label.gender:hover {
     background: #ad1818;
     color: #fff;
 }
+select.gender_pick {border: 1px solid #d1d1d1;
+    border-radius: 4px;
+    height: 50px;
+    font-size: 19px;
+    box-shadow: inset 0 1px 3px rgb(0 0 0 / 10%);
+	padding: 0 15px;
+    width: auto;}
 	</style>
 </head>
 
@@ -393,21 +400,11 @@ label.gender:hover {
 
 					<div class="traveler_info">
 						<h3 data-header>Traveler 1</h3>
-                        <div style="    
-    margin-bottom: -30px;
-    display: inline-block;
-    width: 100%;">
-                            <input type="radio" name="gender[]" id="genderMs" value="100003" style="display:none;" class="tmpick">
-                            <label class="gender" for="genderMs" style="width: 120px;">
-
-                                Ms.</label>
-                            <input type="radio" name="gender[]" id="genderMr" value="100001" style="display:none;" class="tmpick">
-                            <label class="gender" for="genderMr" style="width: 120px;">
-
-                                Mr.</label>
-                        </div>
 						<div class="selectionBlock">
-
+            <select name="gender[]" class="gender_pick">
+                            <option value="100001">Mr.</option>
+                            <option value="100003">Ms.</option>
+                        </select>
 							<div class="inputTerm">
 								<input type="text" name="sur_name[]" required="">
 								<label>
@@ -677,14 +674,14 @@ label.gender:hover {
 						<div class="selectionBlock">
 							<p> Date of birth</p>
 							
-							<input type="text" class="arrivalDate datepicker"
+							<input type="date" class="arrivalDate datepicker"
 								name="birthday[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
 
 						</div>
 						<div class="selectionBlock">
 							<p> Date of expiration </p>
 							
-							<input type="text" class="arrivalDate datepicker"
+							<input type="date" class="arrivalDate datepicker"
 								name="passport_expiration_date[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
 
 						</div>
@@ -770,7 +767,7 @@ label.gender:hover {
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" class="datetimepicker" name="MEI_ArrivalTime" readonly="true" required="">
+							<input type="datetime-local" name="MEI_ArrivalTime" required="">
 							<label>
 								Arrival time
 							</label>
@@ -786,7 +783,7 @@ label.gender:hover {
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" class="datetimepicker" name="MEI_DepartureTime" readonly="true" required="">
+							<input type="datetime-local" name="MEI_DepartureTime" required="">
 							<label>
 								Departure time
 							</label>
diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index bf3fa68d..94633c9d 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -675,14 +675,14 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						<div class="selectionBlock">
 							<p> Date of birth</p>
 							
-							<input type="text" class="arrivalDate datepicker"
+							<input type="date" class="arrivalDate datepicker"
 								name="birthday[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
 
 						</div>
 						<div class="selectionBlock">
 							<p> Date of expiration </p>
 							
-							<input type="text" class="arrivalDate datepicker"
+							<input type="date" class="arrivalDate datepicker"
 								name="passport_expiration_date[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
 
 						</div>
@@ -768,7 +768,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" class="datetimepicker"  name="MEI_ArrivalTime" readonly="true" autocomplete="off" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" required="">
+							<input type="datetime-local" name="MEI_ArrivalTime" required="">
 							<label>
 								Arrival time
 							</label>
@@ -784,7 +784,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" class="datetimepicker"  name="MEI_DepartureTime" readonly="true" autocomplete="off" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" required="">
+							<input type="datetime-local" name="MEI_DepartureTime" required="">
 							<label>
 								Departure time
 							</label>
@@ -948,41 +948,6 @@ select.gender_pick {border: 1px solid #d1d1d1;
       var travelerCount = $(".traveler_info").length + 1;
       $addTraveler.find('[data-header]').text('Traveler ' + travelerCount);
       $('#add_traveler_button').before($addTraveler);
-
-      $('.datepicker').datepicker({
-          controlType: 'select',
-          oneLine: true,
-          changeMonth: true,
-          changeYear: true,
-          yearRange: '2010:2055',
-          timeFormat: 'mm/dd/yy'
-      });
-
-      $('.datetimepicker').datetimepicker({
-          controlType: 'select',
-          oneLine: true,
-          changeMonth: false,
-          changeYear: false,
-          timeFormat: 'H:mm'
-      });
-    });
-
-    
-    $('.datepicker').datepicker({
-      controlType: 'select',
-      oneLine: true,
-      changeMonth: true,
-      changeYear: true,
-      yearRange: '2010:2055',
-      timeFormat: 'mm/dd/yy'
-    });
-
-    $('.datetimepicker').datetimepicker({
-        controlType: 'select',
-        oneLine: true,
-        changeMonth: false,
-        changeYear: false,
-        timeFormat: 'H:mm'
     });
   });
 	</script>