bugfixes for the back button