Refactor, add active users chart