fixes on notifications and links consistancy