Fix navigation

Restructure of navigation to look clean and tidy. Consistent headers on each page.