Fix ghetto form validation
Consolidate markup for form error messages