diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index c553361a..a2e07830 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -171,11 +171,13 @@
                 <div class="trip_date_length" id="tripDateBlock" style="display: none">
                               <p style="text-align: left; font-weight: 400; font-size: 19px;">Select your travel date and trip length (days).</p>
                   <div id='dateSelectionBlock'>
+                                  <div id='flatpickrBlock'>
                   <input type="text" class="arrivalDate datepicker" id="starting_date" name="date_start" value="" placeholder="mm/dd/yyyy" autocomplete="off" style="width: auto;
                   float: left;
                   margin-right: 15px;
                   border-radius: 6px;
-                  padding: 0 15px;">            
+                  padding: 0 15px;">   
+                  </div>         
                   <input type="month" id="expectedMonth" name="expected_month" placeholder="Select your expected travel date." style="width: auto;
                   float: left;
                   margin-right: 15px;
@@ -640,10 +642,9 @@
             });
     
             var $tripDateBlock = $('#tripDateBlock');
-    var $expectedDate = $('#starting_date');
     var $expectedMonth = $('#expectedMonth');
     var $dateSelectionBlock = $('#dateSelectionBlock');
-    var $expectedTravelDateBlock = $('#expectedTravelDateBlock');
+    var $flatpickrBlock = $('#flatpickrBlock');
     $('input[name="trip_date"]').each((i, tripDateEle) => {
 			$(tripDateEle).click(function (e) {
         $expectedDate.val('');
@@ -653,17 +654,15 @@
         selectedExpectedDate = selectedTripDate.id;
         if (selectedTripDate.id === 'exact') {
           $dateSelectionBlock.show();
-          $expectedTravelDateBlock.hide();
           $expectedMonth.hide();
-          $expectedDate.show();
+          $flatpickrBlock.show();
         } else if (selectedTripDate.id === 'approximate') {
           $dateSelectionBlock.show();
-          $expectedTravelDateBlock.hide();
-          $expectedDate.hide();
+          $flatpickrBlock.hide();
           $expectedMonth.show();
         } else if (selectedTripDate.id === 'yet') {
           $dateSelectionBlock.hide();
-          $expectedTravelDateBlock.show();
+          $flatpickrBlock.hide();
         }
       })
     });
@@ -754,37 +753,6 @@
                   }
                 }
               });
-              document.querySelector('.expandAll').onclick = function (e) {
-                let obj = document.querySelector('.expandAll');
-                let all_status = obj.getAttribute("collapse-status");
-                if (all_status == "hide") {
-                  obj.setAttribute("collapse-status", "show");
-                  obj.querySelector(".expandAllText").innerHTML = "Collapse All";
-                  obj.parentNode.querySelectorAll("div[collapse] span[id$='Icon']").forEach(function(icon, i){
-                    icon.classList.remove('OpenIcon');
-                    icon.classList.add('CloseIcon');
-                  });
-                  obj.parentNode.querySelectorAll("div[collapse-content]").forEach(function(itinerary, i){
-                    slideDown(itinerary);
-                  });
-                  obj.parentNode.querySelectorAll("div[collapse]").forEach(function(title, i){
-                    title.setAttribute("collapse-status", "show");
-                  });
-                } else {
-                  obj.setAttribute("collapse-status", "hide");
-                  obj.querySelector(".expandAllText").innerHTML = "Expand All";
-                  obj.parentNode.querySelectorAll("div[collapse] span[id$='Icon']").forEach(function(icon, i){
-                    icon.classList.remove('CloseIcon');
-                    icon.classList.add('OpenIcon');
-                  });
-                  obj.parentNode.querySelectorAll("div[collapse-content]").forEach(function(itinerary, i){
-                    slideUp(itinerary);
-                  });
-                  obj.parentNode.querySelectorAll("div[collapse]").forEach(function(title, i){
-                    title.setAttribute("collapse-status", "hide");
-                  });
-                }
-              }
               function slideUp(target, duration) {
                 duration = duration ? duration : 500;
                 target.style.transitionProperty = 'height, margin, padding';