Rearranges add a clipping modal to make a bit more sense.