back button and fixes