Angular groups

This is how we do it in the old version (except it's in the view, yuck.)

Maybe there's a cleaner way?