Changes/Fixes to the Date-Picker and "remembering" the selections