style and template fixes