Upgrades to DatePicker