fixed back button issues