Refactor: improve form validation and add jquery calendar