Tidied up main nav