#3844: Update to keep existing section navs in the same place.

We need to override every section context to do this. We just look for sections that aren't already overridden and add them.