Shape -> Re-layout shapes

Top