Refactor some flash messages
Merge branch 'release/0.0.8'