User counters update & design fixes