security, UI fixes
Merge pull request #11 from jkamcc/master

security, UI fixes