Moved infoWindow construction to marker listener