Minor layout changes in Counters