Fix highlighting and link