Clean-up set_button_text() added