style and template fix