GCP-8734 margin updates and split panel updates