Added WB points as clusters.
Add display state option.