Moved display_field to macros from email.html