Seems like add/edit categories is all set to go. Improved security rules as well