Adjustments to template_css_class structure/css