Add selected state to ancestors on nav
Remove redundant counter code