Add validations and fix form error