Fixing UI bugs for templates, typos