Divided the capabilities view into groups
Merge pull request #2076 from KoenRijpstra/Grouped-capabilities

Divided the capabilities view into groups