Fixed a few bugs with the SolveScreen