Improve macros editor module plugin