Cleaning up buttons