GCP-9042 UI: The Cross Expansion popup windows needs UI adjustment