Add more display_fields, cleanup
Merge pull request #291 from bhuber/topic/fix-displayed-fields

Add more display_fields, cleanup