Final changes to link highligting