Clean up template and title
Merge pull request #76 from jayfo/template

Clean up template and title