Revert "More Layout"

This reverts commit 99715b024b80620a713e6475d9faa6e5d0837f86.