temporary refactoring of navigation