S73119 Code to optimize layouts

This reverts commit f03d8b806b43db71cd1f399bb6c2a0fb00c16bd3.