Added some validations for form