Merge pull request #65 from nhr/master

Lots of UX cleanup, better help system