Highlighting current line and other minor changes