Some bugfixing for navigation not perfekt but better. Sometimes I get
more than one item on backstack when navigating back