Revert "layout"

This reverts commit 5564fca016b67ca28c25b306c52c67167fdbbb86.