Clean up the navigation a bit