Moved block/wave graphic away from block logic.