Convert forms to model-backed
Add category management system
Add category management system