Navbar visual tweaks

Rebased @ameliagreenhall's branch to remove spurious commits pulled in from master