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.
Put comment before or after the line, whatever makes more sense. Only rarely we have comments to the right of a line of code (usually if they are very short and would make code unnecessary long if in own lines).