Highlights design

Continuation of #257, just that it is a pull request against development branch.