Changed the way back button works