Tidy up main nav bar