improved design of built-in templates