Add highlighting for current subnav links
Remove old grid-3 declarations