Navbar and other things
Merge branch 'master' of https://github.com/RinkeHoekstra/research-story