Minor changes in TemplatePanel