Added support for multiple macros with a combo box selection, added hero macros