Fixing the JS modifications.
Merge pull request #41 from Qwinix/ui_integration

[ui_integration]->[development] Fixing the JS modifications.