Trying to clean up navigation a bit