improve group listing to be more structured