Simplify the navigation some more.
Tweak