DUPLICATE: Improve ux in creating templates

Merge with : A request to improve the template creation process