nav refactor to match wow