Improved per user and per group graphs