Display control field count (and some cosmetic changes)