modified forms and added validations