Improve redraw behavior