GCP-7946 UI Fixes