Nav now shows selection properly