Update highlighting and add numbering