Improved Cluster View.