Fix highlighting & linking of images