more GUI cleanup