*maybe* fixed back button issues