Refactor nav