GCP-7633 Layout improvements