Clean up and makes the activity questions be mangled in the middle of the trivia.
Merge pull request #2 from lomefin/switch_activity

Clean up and makes the activity questions be mangled in the middle of th...