Some changes in templates for organizations