Some clean-up of GUI and code.