UI JS 0.7beta

Various small updates & refactoring
Merge pull request #225 from PuttItOut/master

UI JS 0.7beta