Divided the capabilities view into groups

As request in #1935 i update my branch with latest from 3.0-unstable upstream. 

Sorry for the new pull request but i created a feature branch so i could update to the latest upstream with ease.