Fixed GUI responsability
Fixed merge conflicts
Merge pull request #46 from buren/SwingRefactor

Swing refactor