Changed the way the date picker works