VE-1365 Display fixes in template edit dialog

https://wikia-inc.atlassian.net/browse/VE-1542
Yes.