Trying to make faster for mobile
Fix datepicker conflict