Improved UI and added color based clusters