clean up, back button changed, UI changes