Adding Clustering support, UI improvements