Tried to improve highlights view
Merge pull request #231 from squix78/DevBranch

Tried to improve highlights view