Javascript cleanup
Merged in design changes to new JS
Merge pull request #55 from lossyrob/js/cleanup

Js/cleanup