Code cleanup: buttons for Selector