added a back button and cleaned some stuff