GCP-8271 Fixes on UI