GUI architecture changes