CORE-214 - Button choices