Updates to templates and corresponding css, mainly concantenation and removal of then redundant files.