* couple more style and template fixes