fix template and style