cleanup plus some cleanup of the buttons