Minor style and template change