- Better group display logic