GCP-7478 - initial UI changes