move default macros back out of buildMacroDropdowns
move addMacroButton out of buildMacroDropdowns too