GCP-6163/64 Layout fixes