Fixed issue with date and time pickers

Date and Time pickers now remember what they were set to when opening for a second time