Revert "Revert "Layout 1 Changes""

This reverts commit f7a574c1924cc27cc63c236ab65f9ac3068e8f35.