Improve Datepicker UX