Add a few changes in the html generation
Merge pull request #1 from eloycoto/master

Html template tags