Linked all notif view with the rest of the feature
Merge remote-tracking branch 'origin/master'