Change validation order for error display
Add flash message display
Add error display