The waveforms are now following the increasing order of the cluster indices, except when the wizard is active, in which case the target cluster is always on the left.