better text and rounded corners and grouping