improved interface, macros now editable