Multiple choice now has a button wrapping each choice.