Refactored DatePicker