navigation methods and routes markup refactored