More improvements for the GUI.