A few improvements to GUI.

A few improvements to GUI.