Navigation

Changes navigation to use hierarchical states.
- Improves performance when going up in hierachy.
- Does NOT change page transition animation problems