Improve system edit category