Rework some of the various nav states