Added back button changes