Added more to template-admin stuff.