Support CMSMS2 templates API<br />Admin UI cleanups