incorporated menu macro fixes