Fix highlighting and image hover