Added new transitions for new message
Overhaul function may need a bit more to do
Added notfication button
Added notification setup code