Fixed a few bugs and added two login redirect. Also fixed topbar links
Merge branch 'feature/loginredirects' into develop