Fixed back button issues