Fixed back button navigation issues