back button bug fixes