More changes to the GUI.  Fixed the refresh bug forcing the adapter to be recreated.  Not pretty, but whatever..