Further changes to GUI.