fixed some minor back button bugs