add data type grouping and some minor UI fixes