Made notifications as links and removed all references to simpler