Fixed back button navigation