Fixed form validations (still need to add all)