Grouping of Apps and Entities [DONE]

See smart sections