GCP-8480 (tweak UI layout)