Technologies are described herein for correcting the layout of shapes in a diagram. A request is received to correct the diagram layout. The positional relationships between the shapes in the diagram are determined through the creation of a dependency tree. According to various embodiments, the dependency tree defines parent-child relationships within the diagram and the physical position of shapes with respect to one another. Using the dependency tree and layout rules, the shapes within the diagram may be repositioned to correct misalignment and uneven spacing to make minor corrections in the layout while preserving the general configuration of the original layout. Embodiments provide for layout corrections of diagrams including regions that encompass member shapes and provide for conflict resolution when layout corrective actions result in overlaps of shapes, regions, or page breaks.