Removed some strange back button behaviour