Updated layout diagrams