Refactoring flash messages layout