fix click on generator
Merge branch 'waveform-rendering'
improve waveform perfs