Navigation overhaul

Take several steps towards making the design consistent across the site