Add proposed active navigation state
Add subnav