Refactoring category selection menu
Merge branch 'AI2928-categories' into stable
Fix new category selection menu
Merge branch 'AI2928-categories' into stable