refactoring dravernavigation