GCP-7776 UI Fixes