more on the GUI. Moved some methods around in the classes