Also use dropdown for new Email Templates
Show Email Template label instead of code if available
Adjusted Email Template tests to label instead of codes