Fix template naming issue.
Fix CSS 'namespacing' issue