Changed layering so that movable shapes are above composite shape in the z-order.