Other changes to the GUI System