Scheduler datepicker combobox changes

i will squash after review prior to merge