Fixing Groups tab