Removed static content from the template and added fields
Merge pull request #5 from anthonyray/master

Removed static content from the template and added fields