Revert "New and improved layouts"

This reverts commit 977180ea4d94839d5baffed360d4521d8d78bccb.