updating UI and js
Merge pull request #24 from pannellr/master

updating UI and js