Merge "Move construction of highlight divs to backend"