Fixes + reorder flash message

reordered flash message in the same order the fields appear in the front-end form
Merge pull request #1384 from emanwebdev/patch-30

Fixes + reorder flash messages