Merge pull request #5 from kaosu64/master

UI changes
more fixes
Merge pull request #8 from mindBeef/master

more fixes