Fixed grouping in attributes
New DataGrid options and structure