Sort of fixed redraw on watch/unwatch, drawing labels separately, etc