Refactor templates and stylesheets
Merge pull request #3 from jcf/refactor

Refactor