Fixed caps errors, and old code in the templates
Merge pull request #25 from asaenz/template_fixes

Fixed caps errors, and old code in the templates