Made gui window smaller
Merge remote-tracking branch 'holt/master' into merger