Add more display_fields, cleanup