Improve plotting, grouping