GCP-6164 layout fixes