- Minor refactoring of navigation stuff.