Datepicker and Select refactoring.