Layout pt 2
Revert "Layout pt 2"

This reverts commit 2dbae64d1b064ceab506fabfd350304ff89225c6.