[nav] Continuing to pull nav apart to allow for modal navigation. Still WIP