added waveform layout options