GUI reworking in Java