refactor Grouping class, implement better UI