Wave display optimizations