touching up templates
Merge pull request #7 from billy1339/master

touching up templates