added grouping for bigger displays