Fixing up the date picker