Tried to improve highlights view