Fixed notification pages and tweaks