Overall fixes
Notifications clear on view
Fixes
Fixes