changed name and added validations to forms