minor improvements in template manager