More work on the Swing GUI.