Lots of cleanups and bugfixes and back-nav.

Implement automatic back navigation.
Fix subscriber creation.
Unify controller handling.