Templates page fixes from QA ticket
Merge pull request #401 from flukeout/templateUpdates

Templates page fixes from QA ticket