Fix `o` and `O` behavior
Tweak navigation model to make it ever simpler

Version 3.0