UI changes, code improvements
Merge pull request #6 from jkamcc/master

UI changes, code improvements