Navigate component Refactoring