Updates to html templating
More updates
Merge pull request #1 from craigmoussa/features

Features