Improve the underline markup