rework the date chooser