Fixed the issue with the back button not working