Improve management of the group display