Some changes in RMText & TemplatePanel