new version, still needs GridBagLayout configured
Merge branch 'master' of github.com:ohSmurfy/user_interface