datepicker working but needs some edits