Cleaned up the GUI
Merge branch 'master' of github.com:Muniek/gp