Tidying up the navigation.