JS and Dojo updates