reduced corner radius
moved grouping logic from view to model
changed keys
changed container class