Undo highlight since it's not working and simplify markup