Minor updates

Tweaks to navbar and login button
Merge branch 'master' into gh-pages