Revert "Layout"

This reverts commit d3993e7d2b447fbdc990300e67c3ff6e78679314.