Tweaks. Moving back to navigator to get archetype handling cleaned up.