clean up navigation a bit