Several changes to improve GUI.