WM: Added counter displays, avatars, re-aligned datasets table