Fixes to flash messages, added categories