Fixed redraw functionality