Changes to classes to extend appropriate swing classes