Big refactor of notifs, addresses lost of the review notes