updated waveeditorscreen
fixed merge conflicts