Style and template fix