Here's a revised suggestion for the choice settings page, with options in a separate section, together with the setting 'Limit the number of responses allowed' (as suggested by Fred in MDL-38573). 'Display mode' is also included in the options section, as it seemed to make sense that after entering a number of options, a teacher would then decide how to display them.
I also included the setting 'Allow choice to be updated' in the options section, but perhaps it's better left in the general section. What does everyone think?
General
Choice name
Description
Display description on course page
Options
Limit the number of responses allowed
Option, limit
Option, limit
Option, limit
Option, limit
Option, limit
Display mode
Allow choice to be updated