Refactoring whole nav thing