Fix panel template name, cleanup wrong comments