notifications link to proper pages
Merge branch 'notifications2'