Added validations on forms