New changes for the back button