Cleaned up templating, css
Merge branch 'development' into router
Merge pull request #7 from ndhoule/templating

Templating improvements