Switch out datepicker for scheduler
!660 (merged)