Fixing aliases in remaining layouts that use them.
Added a BAG (BooleanAttributeGroup) component.