tidied up navigation