Refactor: ProductGroups -> ProductContainers
EnableMenus code complete