Restructure layouts a bit, so navbar always highlights the right thing

Also fixed a couple of typos I spotted along the way.