Refactor Navigation