Added form and validations