AT: committing changes to the TaxEditor to fix issues with the dynamic menu building