Added lines, highlighting, tooltips