refactoring the local navigation stuff