Fix redraw
Fix cursor highlight in CUI.