Added clustering and updated infowindow content