Added form validation and removed phone