GUI Modification

Fixed #238
Merge branch 'master' of https://github.com/Donnervoegel/java