back button bug mostly fixed