Chg: datepicker refactor