CORE-65 - Button choices and drop-down choices