Added basic categories and sorting
Merge branch 'master' into testing