Moved the JVM shutdown on window close in the main method
Improved compare of field properties