Adding groups to diagram
Tweaks