template and style fixes