fixed backstack navigation
a bit more working Zones stuff