Fixed question display markup better