CSS and minor template updates