Improved editor templates and fixes