(Menu) More cleanups to set_label