Fixed toggle redraw