Order groups list by name
Merge branch 'groups-list-improvements'