Changes menu labels
Adds templates
Merge pull request #1 from carlos-codecery/templates

Templates