Again... Fixed button macros