refactor nav highlighting