Much streamlined registration of controls. Fixes issues with PartCatalog