I refactored the GUI logic and design
Merge pull request #10 from Tiffastic/master

I refactored the GUI logic and design