Improved GUI.java