- Added logic for groups display