CORE-369 improvements on existing list and adding attr categories
Merge pull request #1907 from reciprocity/feature/mockup-custom-attributes-improve

CORE-369 improvements on existing list and adding attr categories