Updated macros for online display