refactor: group on cell instead of board