Fixed the back button issues of going to incorrect screens.