Updated gui
Merge pull request #16 from Tiffastic/master

Updated gui