Update templates

Update the templates to remove the excessive itemprop tags as it really
is not a good idea.  Cleanup a few minor things.