Revert "Layout"

This reverts commit a18e33877724c7d8f4b92dbe5c341d63360b1061.