refactoring / navigation / fixes