Added consistent form validations where necessary.