Updated layout (GCP-8221)