clean up and add buttons