Move Macro section into modal popup, fixes #11.