Manage notifications

Manage notifications