Changed from AWT view to SWING view