Tidy up GUI to nearly give correct answer.