Combined question and solutions into one screen. Add solution button not yet added back in.