Updated to use third-party datepicker