Merge pull request #16 from AaronGreenberg/master

So hey... I fixed some things... Now the gui does what is should do.... :D
gui changes

trying to make everything fit
Merge pull request #20 from dknip/master

just a couple gui changes - trying to make it all fit