Improved editing categories