Finished changes to link highlighting