js and templates updated for norequire