Fix #646 redraw problem
Fix toggle mark problem
Improve statusline