[#77449908] better use of categories
[#77449908]ability to edit categories
Merge 77449908-single-category to master

[Completes #77449908]