Highlights design

Continuation of #257, just that it is a pull request against development branch. This pull request is addressing #256. Instead of each highlight being one big rectangle area, find smaller reasonable sections and draw border around only them.
p.s. All the variable renames can be easily done using an IDE that supports refactoring.