Back button and bug fixes