[OE-2950] Flash messages and event title mods
[OE-2950] code clean up