Fixes + reorder flash messages

reordered flash message in the same order the fields appear in the front-end form