some style and template fixes