Template refactoring and css extractions
Merge pull request #22 from wpp/template_refactor

Template refactoring and css extractions