Remove trailing space
Add underline
Correct highlight for CursorLine and number of line in rnu mode