Fixes #22. Clean up some navigation stuff.