fixing back button bugs