Rework some of the various nav states
Reword to say Log In
Fix broken tests