More changes in GUI architecture