Merge pull request #890 from BFlavien/master

Issue #495: Refactor JS widgets to use the correct namespace
Merge pull request #891 from BFlavien/master

Issue #495: Refactor JS widgets to use the correct namespace 
Continued...