More nav fixture changes, this time with less infinite recursion.
Merge pull request #302 from seandst/nav-fixture-shenanigans

More nav fixture changes, this time with less infinite recursion.