Merge pull request #39 from marciotrindade/master

Improved js and templates