fix  back button issues