Refactor active nav indicator