Added labels
Added highlight-on-click