button_container.cpp clean up