Changed how info windows work