Some more work on the basic GUI.