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

...e trivia.