[Do not merge] Nav upgrade

* Allows us to just pass the entity as context.  No need to specify a map anymore
* Allows us to navigate *from* particular place without having to go back to the main menu, so we can use the nav abstraction even when we only need to drill into the 3rd level nav.