Updating GUI to work with new structure.