Edits to macros for summer redesign