Fill out the back button functionality a little more