Tidied up user navigation.