Tore out RequiredIf form validation
Worked out some more flash messages