Bug 7082: Template improvements for better translatability