added forms and some validations