Updates to javascript and template files