Refactoring of jsp and js.
Merge pull request #14 from ramirlm/ugo

Refactoring of jsp and js.