css, template fixes