Minor rearrangement of figures