leayout improvements