DO NOT MERGE: Initial review of updated MCQ feature (feedback)

@antoviaque -- check this out and let me know how it looks.