Re-struct redraw logic (highlight with :split works now)