Fix redraw; restructure draw/redraw