More changes towards a better GUI.