Added notification groups and a presentation
Refactored notification code