Feature/flash messages