MacrosCommand processing changes. Minor UI changes