Group content elements in user settings
Merge branch 'hotfix/2.0.1'