CSS and template updates