GCP-6397 minor layout change