Layout Attributes logic moved down into layout section.