easified ui and added stuff
merge
Merge pull request #3 from foresterh/master

easified ui and added stuff