Bugfixes on back button