GCP-6018 Initial UI changes