Refactor to array based navigation