Revert "New layout"

This reverts commit 0d3c12aec2019f8ac850a483b4f28d880159265a.