Sub-nav rework